diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-15 11:06:43 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-15 11:31:31 +0200 |
| commit | c411f16870f112c3407c28c22b617f613a82cff4 (patch) | |
| tree | 29a1bcd590c8b31af2aab445bfe8a978dc5bf582 /src/3rdparty/webkit/WebCore/generated | |
| parent | 3d77b56b32a0c53ec0bbfaa07236fedb900ff336 (diff) | |
| download | qt4-tools-c411f16870f112c3407c28c22b617f613a82cff4.tar.gz | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit-4.6-snapshot-15062009 ( 65232bf00dc494ebfd978f998c88f58d18ecce1e )
Diffstat (limited to 'src/3rdparty/webkit/WebCore/generated')
668 files changed, 29474 insertions, 21600 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/ArrayPrototype.lut.h b/src/3rdparty/webkit/WebCore/generated/ArrayPrototype.lut.h index 9beec6b373..da67f2e731 100644 --- a/src/3rdparty/webkit/WebCore/generated/ArrayPrototype.lut.h +++ b/src/3rdparty/webkit/WebCore/generated/ArrayPrototype.lut.h @@ -4,7 +4,7 @@ namespace JSC { -static const struct HashTableValue arrayTableValues[20] = { +static const struct HashTableValue arrayTableValues[22] = { { "toString", DontEnum|Function, (intptr_t)arrayProtoFuncToString, (intptr_t)0 }, { "toLocaleString", DontEnum|Function, (intptr_t)arrayProtoFuncToLocaleString, (intptr_t)0 }, { "concat", DontEnum|Function, (intptr_t)arrayProtoFuncConcat, (intptr_t)1 }, @@ -23,15 +23,12 @@ static const struct HashTableValue arrayTableValues[20] = { { "indexOf", DontEnum|Function, (intptr_t)arrayProtoFuncIndexOf, (intptr_t)1 }, { "lastIndexOf", DontEnum|Function, (intptr_t)arrayProtoFuncLastIndexOf, (intptr_t)1 }, { "filter", DontEnum|Function, (intptr_t)arrayProtoFuncFilter, (intptr_t)1 }, + { "reduce", DontEnum|Function, (intptr_t)arrayProtoFuncReduce, (intptr_t)1 }, + { "reduceRight", DontEnum|Function, (intptr_t)arrayProtoFuncReduceRight, (intptr_t)1 }, { "map", DontEnum|Function, (intptr_t)arrayProtoFuncMap, (intptr_t)1 }, { 0, 0, 0, 0 } }; extern const struct HashTable arrayTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 127, arrayTableValues, 0 }; -#else { 65, 63, arrayTableValues, 0 }; -#endif - } // namespace diff --git a/src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp b/src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp index b980a0ac11..1c2da0693e 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp +++ b/src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp @@ -1,24 +1,23 @@ -/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* A Bison parser, made by GNU Bison 2.4.1. */ - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +/* Skeleton implementation for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -29,7 +28,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -47,7 +46,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.3" +#define YYBISON_VERSION "2.4.1" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -55,157 +54,28 @@ /* Pure parsers. */ #define YYPURE 1 +/* Push parsers. */ +#define YYPUSH 0 + +/* Pull parsers. */ +#define YYPULL 1 + /* Using locations. */ #define YYLSP_NEEDED 0 /* Substitute the variable and function names. */ -#define yyparse cssyyparse -#define yylex cssyylex -#define yyerror cssyyerror -#define yylval cssyylval -#define yychar cssyychar -#define yydebug cssyydebug -#define yynerrs cssyynerrs - - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - TOKEN_EOF = 0, - UNIMPORTANT_TOK = 258, - WHITESPACE = 259, - SGML_CD = 260, - INCLUDES = 261, - DASHMATCH = 262, - BEGINSWITH = 263, - ENDSWITH = 264, - CONTAINS = 265, - STRING = 266, - IDENT = 267, - NTH = 268, - HEX = 269, - IDSEL = 270, - IMPORT_SYM = 271, - PAGE_SYM = 272, - MEDIA_SYM = 273, - FONT_FACE_SYM = 274, - CHARSET_SYM = 275, - NAMESPACE_SYM = 276, - WEBKIT_RULE_SYM = 277, - WEBKIT_DECLS_SYM = 278, - WEBKIT_KEYFRAME_RULE_SYM = 279, - WEBKIT_KEYFRAMES_SYM = 280, - WEBKIT_VALUE_SYM = 281, - WEBKIT_MEDIAQUERY_SYM = 282, - WEBKIT_SELECTOR_SYM = 283, - WEBKIT_VARIABLES_SYM = 284, - WEBKIT_DEFINE_SYM = 285, - VARIABLES_FOR = 286, - WEBKIT_VARIABLES_DECLS_SYM = 287, - ATKEYWORD = 288, - IMPORTANT_SYM = 289, - MEDIA_ONLY = 290, - MEDIA_NOT = 291, - MEDIA_AND = 292, - QEMS = 293, - EMS = 294, - EXS = 295, - PXS = 296, - CMS = 297, - MMS = 298, - INS = 299, - PTS = 300, - PCS = 301, - DEGS = 302, - RADS = 303, - GRADS = 304, - TURNS = 305, - MSECS = 306, - SECS = 307, - HERZ = 308, - KHERZ = 309, - DIMEN = 310, - PERCENTAGE = 311, - FLOATTOKEN = 312, - INTEGER = 313, - URI = 314, - FUNCTION = 315, - NOTFUNCTION = 316, - UNICODERANGE = 317, - VARCALL = 318 - }; -#endif -/* Tokens. */ -#define TOKEN_EOF 0 -#define UNIMPORTANT_TOK 258 -#define WHITESPACE 259 -#define SGML_CD 260 -#define INCLUDES 261 -#define DASHMATCH 262 -#define BEGINSWITH 263 -#define ENDSWITH 264 -#define CONTAINS 265 -#define STRING 266 -#define IDENT 267 -#define NTH 268 -#define HEX 269 -#define IDSEL 270 -#define IMPORT_SYM 271 -#define PAGE_SYM 272 -#define MEDIA_SYM 273 -#define FONT_FACE_SYM 274 -#define CHARSET_SYM 275 -#define NAMESPACE_SYM 276 -#define WEBKIT_RULE_SYM 277 -#define WEBKIT_DECLS_SYM 278 -#define WEBKIT_KEYFRAME_RULE_SYM 279 -#define WEBKIT_KEYFRAMES_SYM 280 -#define WEBKIT_VALUE_SYM 281 -#define WEBKIT_MEDIAQUERY_SYM 282 -#define WEBKIT_SELECTOR_SYM 283 -#define WEBKIT_VARIABLES_SYM 284 -#define WEBKIT_DEFINE_SYM 285 -#define VARIABLES_FOR 286 -#define WEBKIT_VARIABLES_DECLS_SYM 287 -#define ATKEYWORD 288 -#define IMPORTANT_SYM 289 -#define MEDIA_ONLY 290 -#define MEDIA_NOT 291 -#define MEDIA_AND 292 -#define QEMS 293 -#define EMS 294 -#define EXS 295 -#define PXS 296 -#define CMS 297 -#define MMS 298 -#define INS 299 -#define PTS 300 -#define PCS 301 -#define DEGS 302 -#define RADS 303 -#define GRADS 304 -#define TURNS 305 -#define MSECS 306 -#define SECS 307 -#define HERZ 308 -#define KHERZ 309 -#define DIMEN 310 -#define PERCENTAGE 311 -#define FLOATTOKEN 312 -#define INTEGER 313 -#define URI 314 -#define FUNCTION 315 -#define NOTFUNCTION 316 -#define UNICODERANGE 317 -#define VARCALL 318 - - +#define yyparse cssyyparse +#define yylex cssyylex +#define yyerror cssyyerror +#define yylval cssyylval +#define yychar cssyychar +#define yydebug cssyydebug +#define yynerrs cssyynerrs /* Copy the first part of user declarations. */ + +/* Line 189 of yacc.c */ #line 1 "../css/CSSGrammar.y" @@ -235,6 +105,7 @@ #include "CSSMediaRule.h" #include "CSSParser.h" +#include "CSSPrimitiveValue.h" #include "CSSPropertyNames.h" #include "CSSRuleList.h" #include "CSSSelector.h" @@ -261,6 +132,9 @@ using namespace HTMLNames; +/* Line 189 of yacc.c */ +#line 137 "WebCore/tmp/../generated/CSSGrammar.tab.c" + /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -279,10 +153,88 @@ using namespace HTMLNames; # define YYTOKEN_TABLE 0 #endif + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + TOKEN_EOF = 0, + LOWEST_PREC = 258, + UNIMPORTANT_TOK = 259, + WHITESPACE = 260, + SGML_CD = 261, + INCLUDES = 262, + DASHMATCH = 263, + BEGINSWITH = 264, + ENDSWITH = 265, + CONTAINS = 266, + STRING = 267, + IDENT = 268, + NTH = 269, + HEX = 270, + IDSEL = 271, + IMPORT_SYM = 272, + PAGE_SYM = 273, + MEDIA_SYM = 274, + FONT_FACE_SYM = 275, + CHARSET_SYM = 276, + NAMESPACE_SYM = 277, + WEBKIT_RULE_SYM = 278, + WEBKIT_DECLS_SYM = 279, + WEBKIT_KEYFRAME_RULE_SYM = 280, + WEBKIT_KEYFRAMES_SYM = 281, + WEBKIT_VALUE_SYM = 282, + WEBKIT_MEDIAQUERY_SYM = 283, + WEBKIT_SELECTOR_SYM = 284, + WEBKIT_VARIABLES_SYM = 285, + WEBKIT_DEFINE_SYM = 286, + VARIABLES_FOR = 287, + WEBKIT_VARIABLES_DECLS_SYM = 288, + ATKEYWORD = 289, + IMPORTANT_SYM = 290, + MEDIA_ONLY = 291, + MEDIA_NOT = 292, + MEDIA_AND = 293, + QEMS = 294, + EMS = 295, + EXS = 296, + PXS = 297, + CMS = 298, + MMS = 299, + INS = 300, + PTS = 301, + PCS = 302, + DEGS = 303, + RADS = 304, + GRADS = 305, + TURNS = 306, + MSECS = 307, + SECS = 308, + HERZ = 309, + KHERZ = 310, + DIMEN = 311, + PERCENTAGE = 312, + FLOATTOKEN = 313, + INTEGER = 314, + URI = 315, + FUNCTION = 316, + NOTFUNCTION = 317, + UNICODERANGE = 318, + VARCALL = 319 + }; +#endif + + + #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 57 "../css/CSSGrammar.y" { + +/* Line 214 of yacc.c */ +#line 58 "../css/CSSGrammar.y" + bool boolean; char character; int integer; @@ -304,19 +256,22 @@ typedef union YYSTYPE WebKitCSSKeyframeRule* keyframeRule; WebKitCSSKeyframesRule* keyframesRule; float val; -} -/* Line 187 of yacc.c. */ -#line 310 "WebCore/tmp/../generated/CSSGrammar.tab.c" - YYSTYPE; + + + +/* Line 214 of yacc.c */ +#line 264 "WebCore/tmp/../generated/CSSGrammar.tab.c" +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif - /* Copy the second part of user declarations. */ -#line 81 "../css/CSSGrammar.y" + +/* Line 264 of yacc.c */ +#line 82 "../css/CSSGrammar.y" static inline int cssyyerror(const char*) @@ -331,8 +286,8 @@ static int cssyylex(YYSTYPE* yylval, void* parser) -/* Line 216 of yacc.c. */ -#line 336 "WebCore/tmp/../generated/CSSGrammar.tab.c" +/* Line 264 of yacc.c */ +#line 291 "WebCore/tmp/../generated/CSSGrammar.tab.c" #ifdef short # undef short @@ -407,14 +362,14 @@ typedef short int yytype_int16; #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static int -YYID (int i) +YYID (int yyi) #else static int -YYID (i) - int i; +YYID (yyi) + int yyi; #endif { - return i; + return yyi; } #endif @@ -495,9 +450,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; - YYSTYPE yyvs; - }; + yytype_int16 yyss_alloc; + YYSTYPE yyvs_alloc; +}; /* The size of the maximum gap between one aligned stack and the next. */ # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) @@ -531,12 +486,12 @@ union yyalloc elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack) \ +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ do \ { \ YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ @@ -547,10 +502,10 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 28 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1274 +#define YYLAST 1315 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 84 +#define YYNTOKENS 85 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 90 /* YYNRULES -- Number of rules. */ @@ -560,7 +515,7 @@ union yyalloc /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 318 +#define YYMAXUTOK 319 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -571,16 +526,16 @@ static const yytype_uint8 yytranslate[] = 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 82, 2, 83, 2, 2, - 72, 73, 19, 75, 74, 78, 17, 81, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 16, 71, - 2, 80, 77, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 83, 2, 84, 2, 2, + 73, 74, 20, 76, 75, 79, 18, 82, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 17, 72, + 2, 81, 78, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 18, 2, 79, 2, 2, 2, 2, 2, 2, + 2, 19, 2, 80, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 69, 20, 70, 76, 2, 2, 2, + 2, 2, 2, 70, 21, 71, 77, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -595,11 +550,11 @@ static const yytype_uint8 yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 15, 16, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68 + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69 }; #if YYDEBUG @@ -639,130 +594,130 @@ static const yytype_uint16 yyprhs[] = /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 85, 0, -1, 96, 95, 99, 100, 101, 102, -1, - 87, 94, -1, 89, 94, -1, 91, 94, -1, 92, - 94, -1, 93, 94, -1, 90, 94, -1, 88, 94, - -1, 103, -1, 108, -1, 27, 69, 94, 86, 94, - 70, -1, 29, 69, 94, 132, 94, 70, -1, 28, - 69, 94, 154, 70, -1, 37, 69, 94, 111, 70, - -1, 31, 69, 94, 159, 70, -1, 32, 4, 94, - 124, 70, -1, 33, 69, 94, 140, 70, -1, -1, - 94, 4, -1, -1, 95, 5, -1, 95, 4, -1, - -1, 98, -1, 70, -1, 0, -1, 25, 94, 11, - 94, 71, -1, 25, 1, 172, -1, 25, 1, 71, - -1, -1, 99, 108, 95, -1, 168, -1, -1, 100, - 109, 95, -1, -1, 101, 115, 95, -1, -1, 102, - 104, 95, -1, 139, -1, 127, -1, 135, -1, 136, - -1, 129, -1, 103, -1, 171, -1, 167, -1, 169, - -1, -1, 105, 107, 95, -1, 139, -1, 135, -1, - 136, -1, 129, -1, 106, -1, 171, -1, 167, -1, - 169, -1, 170, -1, 21, 94, 117, 94, 125, 71, - -1, 21, 94, 117, 94, 125, 172, -1, 21, 1, - 71, -1, 21, 1, 172, -1, 34, 94, 125, 69, - 94, 111, 70, -1, 35, 94, 110, 69, 94, 111, - 70, -1, -1, 36, 4, 126, -1, 113, -1, 112, - 113, -1, 112, -1, 1, 173, 1, -1, 1, -1, - 112, 1, -1, 113, 71, 94, -1, 113, 173, 71, - 94, -1, 1, 71, 94, -1, 1, 173, 1, 71, - 94, -1, 112, 113, 71, 94, -1, 112, 1, 71, - 94, -1, 112, 1, 173, 1, 71, 94, -1, 114, - 16, 94, 159, -1, 114, 94, 69, 94, 154, 70, - 94, -1, 114, 1, -1, 114, 16, 94, 1, 159, - -1, 114, 16, 94, -1, 114, 16, 94, 1, -1, - 12, 94, -1, 26, 94, 116, 117, 94, 71, -1, - 26, 1, 172, -1, 26, 1, 71, -1, -1, 12, - 4, -1, 11, -1, 64, -1, 12, 94, -1, -1, - 16, 94, 159, 94, -1, 72, 94, 118, 94, 119, - 73, 94, -1, 120, -1, 121, 94, 42, 94, 120, - -1, -1, 42, 94, 121, -1, -1, 40, -1, 41, - -1, 121, -1, 123, 94, 128, 122, -1, -1, 126, - -1, 124, -1, 126, 74, 94, 124, -1, 126, 1, - -1, 23, 94, 126, 69, 94, 105, 166, -1, 23, - 94, 69, 94, 105, 166, -1, 12, 94, -1, 30, - 94, 130, 94, 69, 94, 131, 70, -1, 12, -1, - 11, -1, -1, 131, 132, 94, -1, 133, 94, 69, - 94, 154, 70, -1, 134, -1, 133, 94, 74, 94, - 134, -1, 61, -1, 12, -1, 22, 1, 172, -1, - 22, 1, 71, -1, 24, 94, 69, 94, 154, 70, - 94, -1, 24, 1, 172, -1, 24, 1, 71, -1, - 75, 94, -1, 76, 94, -1, 77, 94, -1, 78, - -1, 75, -1, 140, 69, 94, 154, 97, -1, 142, - -1, 140, 74, 94, 142, -1, 140, 1, -1, 142, - 4, -1, 144, -1, 141, -1, 141, 144, -1, 142, - 137, 144, -1, 142, 1, -1, 20, -1, 19, 20, - -1, 12, 20, -1, 145, -1, 145, 146, -1, 146, - -1, 143, 145, -1, 143, 145, 146, -1, 143, 146, - -1, 12, -1, 19, -1, 147, -1, 146, 147, -1, - 146, 1, -1, 15, -1, 14, -1, 148, -1, 150, - -1, 153, -1, 17, 12, -1, 12, 94, -1, 18, - 94, 149, 79, -1, 18, 94, 149, 151, 94, 152, - 94, 79, -1, 18, 94, 143, 149, 79, -1, 18, - 94, 143, 149, 151, 94, 152, 94, 79, -1, 80, - -1, 6, -1, 7, -1, 8, -1, 9, -1, 10, - -1, 12, -1, 11, -1, 16, 12, -1, 16, 16, - 12, -1, 16, 65, 13, 73, -1, 16, 65, 63, - 73, -1, 16, 65, 12, 73, -1, 16, 66, 94, - 144, 94, 73, -1, 156, -1, 155, 156, -1, 155, - -1, 1, 173, 1, -1, 1, -1, 155, 1, -1, - 155, 173, -1, 156, 71, 94, -1, 156, 173, 71, - 94, -1, 1, 71, 94, -1, 1, 173, 1, 71, - 94, -1, 155, 156, 71, 94, -1, 155, 1, 71, - 94, -1, 155, 1, 173, 1, 71, 94, -1, 157, - 16, 94, 159, 158, -1, 163, 94, -1, 157, 1, - -1, 157, 16, 94, 1, 159, 158, -1, 157, 16, - 94, 159, 158, 1, -1, 39, 94, -1, 157, 16, - 94, -1, 157, 16, 94, 1, -1, 157, 172, -1, - 12, 94, -1, 39, 94, -1, -1, 161, -1, 159, - 160, 161, -1, 159, 1, -1, 81, 94, -1, 74, - 94, -1, -1, 162, -1, 138, 162, -1, 11, 94, - -1, 12, 94, -1, 60, 94, -1, 138, 60, 94, - -1, 64, 94, -1, 67, 94, -1, 165, -1, 82, - 94, -1, 164, -1, 163, 94, -1, 83, 94, -1, - 63, 94, -1, 62, 94, -1, 61, 94, -1, 46, - 94, -1, 47, 94, -1, 48, 94, -1, 49, 94, - -1, 50, 94, -1, 51, 94, -1, 52, 94, -1, - 53, 94, -1, 54, 94, -1, 55, 94, -1, 56, - 94, -1, 57, 94, -1, 58, 94, -1, 59, 94, - -1, 44, 94, -1, 43, 94, -1, 45, 94, -1, - 68, -1, 65, 94, 159, 73, 94, -1, 65, 94, - 1, -1, 14, 94, -1, 15, 94, -1, 97, -1, - 1, 97, -1, 38, 1, 172, -1, 38, 1, 71, - -1, 167, 95, -1, 168, 167, 95, -1, 108, -1, - 127, -1, 1, 172, -1, 69, 1, 173, 1, 97, - -1, 69, 1, 97, -1, 172, -1, 173, 1, 172, + 86, 0, -1, 97, 96, 100, 101, 102, 103, -1, + 88, 95, -1, 90, 95, -1, 92, 95, -1, 93, + 95, -1, 94, 95, -1, 91, 95, -1, 89, 95, + -1, 104, -1, 109, -1, 28, 70, 95, 87, 95, + 71, -1, 30, 70, 95, 133, 95, 71, -1, 29, + 70, 95, 155, 71, -1, 38, 70, 95, 112, 71, + -1, 32, 70, 95, 160, 71, -1, 33, 5, 95, + 125, 71, -1, 34, 70, 95, 141, 71, -1, -1, + 95, 5, -1, -1, 96, 6, -1, 96, 5, -1, + -1, 99, -1, 71, -1, 0, -1, 26, 95, 12, + 95, 72, -1, 26, 1, 173, -1, 26, 1, 72, + -1, -1, 100, 109, 96, -1, 169, -1, -1, 101, + 110, 96, -1, -1, 102, 116, 96, -1, -1, 103, + 105, 96, -1, 140, -1, 128, -1, 136, -1, 137, + -1, 130, -1, 104, -1, 172, -1, 168, -1, 170, + -1, -1, 106, 108, 96, -1, 140, -1, 136, -1, + 137, -1, 130, -1, 107, -1, 172, -1, 168, -1, + 170, -1, 171, -1, 22, 95, 118, 95, 126, 72, + -1, 22, 95, 118, 95, 126, 173, -1, 22, 1, + 72, -1, 22, 1, 173, -1, 35, 95, 126, 70, + 95, 112, 71, -1, 36, 95, 111, 70, 95, 112, + 71, -1, -1, 37, 5, 127, -1, 114, -1, 113, + 114, -1, 113, -1, 1, 174, 1, -1, 1, -1, + 113, 1, -1, 114, 72, 95, -1, 114, 174, 72, + 95, -1, 1, 72, 95, -1, 1, 174, 1, 72, + 95, -1, 113, 114, 72, 95, -1, 113, 1, 72, + 95, -1, 113, 1, 174, 1, 72, 95, -1, 115, + 17, 95, 160, -1, 115, 95, 70, 95, 155, 71, + 95, -1, 115, 1, -1, 115, 17, 95, 1, 160, + -1, 115, 17, 95, -1, 115, 17, 95, 1, -1, + 13, 95, -1, 27, 95, 117, 118, 95, 72, -1, + 27, 1, 173, -1, 27, 1, 72, -1, -1, 13, + 5, -1, 12, -1, 65, -1, 13, 95, -1, -1, + 17, 95, 160, 95, -1, 73, 95, 119, 95, 120, + 74, 95, -1, 121, -1, 122, 95, 43, 95, 121, + -1, -1, 43, 95, 122, -1, -1, 41, -1, 42, + -1, 122, -1, 124, 95, 129, 123, -1, -1, 127, + -1, 125, -1, 127, 75, 95, 125, -1, 127, 1, + -1, 24, 95, 127, 70, 95, 106, 167, -1, 24, + 95, 70, 95, 106, 167, -1, 13, 95, -1, 31, + 95, 131, 95, 70, 95, 132, 71, -1, 13, -1, + 12, -1, -1, 132, 133, 95, -1, 134, 95, 70, + 95, 155, 71, -1, 135, -1, 134, 95, 75, 95, + 135, -1, 62, -1, 13, -1, 23, 1, 173, -1, + 23, 1, 72, -1, 25, 95, 70, 95, 155, 71, + 95, -1, 25, 1, 173, -1, 25, 1, 72, -1, + 76, 95, -1, 77, 95, -1, 78, 95, -1, 79, + -1, 76, -1, 141, 70, 95, 155, 98, -1, 143, + -1, 141, 75, 95, 143, -1, 141, 1, -1, 143, + 5, -1, 145, -1, 142, -1, 142, 145, -1, 143, + 138, 145, -1, 143, 1, -1, 21, -1, 20, 21, + -1, 13, 21, -1, 146, -1, 146, 147, -1, 147, + -1, 144, 146, -1, 144, 146, 147, -1, 144, 147, + -1, 13, -1, 20, -1, 148, -1, 147, 148, -1, + 147, 1, -1, 16, -1, 15, -1, 149, -1, 151, + -1, 154, -1, 18, 13, -1, 13, 95, -1, 19, + 95, 150, 80, -1, 19, 95, 150, 152, 95, 153, + 95, 80, -1, 19, 95, 144, 150, 80, -1, 19, + 95, 144, 150, 152, 95, 153, 95, 80, -1, 81, + -1, 7, -1, 8, -1, 9, -1, 10, -1, 11, + -1, 13, -1, 12, -1, 17, 13, -1, 17, 17, + 13, -1, 17, 66, 14, 74, -1, 17, 66, 64, + 74, -1, 17, 66, 13, 74, -1, 17, 67, 95, + 145, 95, 74, -1, 157, -1, 156, 157, -1, 156, + -1, 1, 174, 1, -1, 1, -1, 156, 1, -1, + 156, 174, -1, 157, 72, 95, -1, 157, 174, 72, + 95, -1, 1, 72, 95, -1, 1, 174, 1, 72, + 95, -1, 156, 157, 72, 95, -1, 156, 1, 72, + 95, -1, 156, 1, 174, 1, 72, 95, -1, 158, + 17, 95, 160, 159, -1, 164, 95, -1, 158, 1, + -1, 158, 17, 95, 1, 160, 159, -1, 158, 17, + 95, 160, 159, 1, -1, 40, 95, -1, 158, 17, + 95, -1, 158, 17, 95, 1, -1, 158, 173, -1, + 13, 95, -1, 40, 95, -1, -1, 162, -1, 160, + 161, 162, -1, 160, 1, -1, 82, 95, -1, 75, + 95, -1, -1, 163, -1, 139, 163, -1, 12, 95, + -1, 13, 95, -1, 61, 95, -1, 139, 61, 95, + -1, 65, 95, -1, 68, 95, -1, 166, -1, 83, + 95, -1, 165, -1, 164, 95, -1, 84, 95, -1, + 64, 95, -1, 63, 95, -1, 62, 95, -1, 47, + 95, -1, 48, 95, -1, 49, 95, -1, 50, 95, + -1, 51, 95, -1, 52, 95, -1, 53, 95, -1, + 54, 95, -1, 55, 95, -1, 56, 95, -1, 57, + 95, -1, 58, 95, -1, 59, 95, -1, 60, 95, + -1, 45, 95, -1, 44, 95, -1, 46, 95, -1, + 69, -1, 66, 95, 160, 74, 95, -1, 66, 95, + 1, -1, 15, 95, -1, 16, 95, -1, 98, -1, + 1, 98, -1, 39, 1, 173, -1, 39, 1, 72, + -1, 168, 96, -1, 169, 168, 96, -1, 109, -1, + 128, -1, 1, 173, -1, 70, 1, 174, 1, 98, + -1, 70, 1, 98, -1, 173, -1, 174, 1, 173, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 263, 263, 264, 265, 266, 267, 268, 269, 270, - 274, 275, 279, 285, 291, 297, 303, 317, 324, 334, - 335, 338, 340, 341, 344, 346, 351, 352, 356, 362, - 364, 368, 370, 375, 379, 381, 388, 390, 393, 395, - 403, 404, 405, 406, 407, 411, 412, 413, 414, 418, - 419, 430, 431, 432, 433, 437, 438, 439, 440, 441, - 446, 449, 452, 455, 461, 465, 471, 475, 481, 484, - 489, 492, 495, 498, 504, 507, 510, 513, 516, 521, - 524, 530, 534, 538, 542, 546, 551, 558, 564, 569, - 570, 574, 575, 579, 580, 584, 590, 593, 599, 606, - 611, 618, 621, 627, 630, 633, 639, 644, 652, 655, - 659, 664, 669, 675, 678, 684, 690, 697, 698, 702, - 703, 711, 717, 722, 731, 732, 756, 759, 765, 769, - 772, 778, 779, 780, 784, 785, 789, 795, 804, 812, - 818, 824, 827, 831, 847, 867, 873, 874, 875, 879, - 884, 891, 897, 907, 919, 932, 940, 948, 951, 964, - 970, 978, 990, 991, 992, 996, 1007, 1018, 1023, 1029, - 1037, 1049, 1052, 1055, 1058, 1061, 1064, 1070, 1071, 1075, - 1100, 1115, 1133, 1151, 1170, 1185, 1188, 1193, 1196, 1199, - 1202, 1205, 1211, 1214, 1217, 1220, 1223, 1228, 1231, 1237, - 1251, 1263, 1267, 1274, 1279, 1284, 1289, 1294, 1301, 1307, - 1308, 1312, 1317, 1331, 1337, 1340, 1343, 1349, 1350, 1351, - 1352, 1358, 1359, 1360, 1361, 1362, 1363, 1365, 1368, 1371, - 1375, 1376, 1377, 1378, 1379, 1380, 1381, 1382, 1383, 1384, - 1385, 1386, 1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394, - 1398, 1406, 1415, 1431, 1432, 1439, 1442, 1448, 1451, 1457, - 1458, 1462, 1468, 1474, 1492, 1493, 1497, 1498 + 0, 266, 266, 267, 268, 269, 270, 271, 272, 273, + 277, 278, 282, 288, 294, 300, 306, 320, 327, 337, + 338, 341, 343, 344, 347, 349, 354, 355, 359, 365, + 367, 371, 373, 378, 382, 384, 391, 393, 396, 398, + 406, 407, 408, 409, 410, 414, 415, 416, 417, 421, + 422, 433, 434, 435, 436, 440, 441, 442, 443, 444, + 449, 452, 455, 458, 464, 468, 474, 478, 484, 487, + 492, 495, 498, 501, 507, 510, 513, 516, 519, 524, + 527, 533, 537, 541, 545, 549, 554, 561, 567, 572, + 573, 577, 578, 582, 583, 587, 593, 596, 602, 609, + 614, 621, 624, 630, 633, 636, 642, 647, 655, 658, + 662, 667, 672, 678, 681, 687, 693, 700, 701, 705, + 706, 714, 720, 725, 734, 735, 759, 762, 768, 772, + 775, 781, 782, 783, 787, 788, 792, 798, 807, 815, + 821, 827, 830, 834, 850, 870, 876, 877, 878, 882, + 887, 894, 900, 910, 922, 935, 943, 951, 954, 967, + 973, 981, 993, 994, 995, 999, 1010, 1021, 1026, 1032, + 1040, 1052, 1055, 1058, 1061, 1064, 1067, 1073, 1074, 1078, + 1108, 1128, 1146, 1164, 1183, 1198, 1201, 1206, 1209, 1212, + 1215, 1218, 1224, 1227, 1230, 1233, 1236, 1241, 1244, 1250, + 1264, 1276, 1280, 1287, 1292, 1297, 1302, 1307, 1314, 1320, + 1321, 1325, 1330, 1344, 1350, 1353, 1356, 1362, 1363, 1364, + 1365, 1371, 1372, 1373, 1374, 1375, 1376, 1378, 1381, 1384, + 1390, 1391, 1392, 1393, 1394, 1395, 1396, 1397, 1398, 1399, + 1400, 1401, 1402, 1403, 1404, 1405, 1406, 1407, 1408, 1409, + 1413, 1421, 1430, 1446, 1447, 1454, 1457, 1463, 1466, 1472, + 1473, 1477, 1483, 1489, 1507, 1508, 1512, 1513 }; #endif @@ -771,27 +726,28 @@ static const yytype_uint16 yyrline[] = First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "TOKEN_EOF", "error", "$undefined", "UNIMPORTANT_TOK", "WHITESPACE", - "SGML_CD", "INCLUDES", "DASHMATCH", "BEGINSWITH", "ENDSWITH", "CONTAINS", - "STRING", "IDENT", "NTH", "HEX", "IDSEL", "':'", "'.'", "'['", "'*'", - "'|'", "IMPORT_SYM", "PAGE_SYM", "MEDIA_SYM", "FONT_FACE_SYM", - "CHARSET_SYM", "NAMESPACE_SYM", "WEBKIT_RULE_SYM", "WEBKIT_DECLS_SYM", - "WEBKIT_KEYFRAME_RULE_SYM", "WEBKIT_KEYFRAMES_SYM", "WEBKIT_VALUE_SYM", - "WEBKIT_MEDIAQUERY_SYM", "WEBKIT_SELECTOR_SYM", "WEBKIT_VARIABLES_SYM", - "WEBKIT_DEFINE_SYM", "VARIABLES_FOR", "WEBKIT_VARIABLES_DECLS_SYM", - "ATKEYWORD", "IMPORTANT_SYM", "MEDIA_ONLY", "MEDIA_NOT", "MEDIA_AND", - "QEMS", "EMS", "EXS", "PXS", "CMS", "MMS", "INS", "PTS", "PCS", "DEGS", - "RADS", "GRADS", "TURNS", "MSECS", "SECS", "HERZ", "KHERZ", "DIMEN", - "PERCENTAGE", "FLOATTOKEN", "INTEGER", "URI", "FUNCTION", "NOTFUNCTION", - "UNICODERANGE", "VARCALL", "'{'", "'}'", "';'", "'('", "')'", "','", - "'+'", "'~'", "'>'", "'-'", "']'", "'='", "'/'", "'#'", "'%'", "$accept", - "stylesheet", "valid_rule_or_import", "webkit_rule", - "webkit_keyframe_rule", "webkit_decls", "webkit_variables_decls", - "webkit_value", "webkit_mediaquery", "webkit_selector", "maybe_space", - "maybe_sgml", "maybe_charset", "closing_brace", "charset", "import_list", - "variables_list", "namespace_list", "rule_list", "valid_rule", "rule", - "block_rule_list", "block_valid_rule", "block_rule", "import", - "variables_rule", "variables_media_list", "variables_declaration_list", + "TOKEN_EOF", "error", "$undefined", "LOWEST_PREC", "UNIMPORTANT_TOK", + "WHITESPACE", "SGML_CD", "INCLUDES", "DASHMATCH", "BEGINSWITH", + "ENDSWITH", "CONTAINS", "STRING", "IDENT", "NTH", "HEX", "IDSEL", "':'", + "'.'", "'['", "'*'", "'|'", "IMPORT_SYM", "PAGE_SYM", "MEDIA_SYM", + "FONT_FACE_SYM", "CHARSET_SYM", "NAMESPACE_SYM", "WEBKIT_RULE_SYM", + "WEBKIT_DECLS_SYM", "WEBKIT_KEYFRAME_RULE_SYM", "WEBKIT_KEYFRAMES_SYM", + "WEBKIT_VALUE_SYM", "WEBKIT_MEDIAQUERY_SYM", "WEBKIT_SELECTOR_SYM", + "WEBKIT_VARIABLES_SYM", "WEBKIT_DEFINE_SYM", "VARIABLES_FOR", + "WEBKIT_VARIABLES_DECLS_SYM", "ATKEYWORD", "IMPORTANT_SYM", "MEDIA_ONLY", + "MEDIA_NOT", "MEDIA_AND", "QEMS", "EMS", "EXS", "PXS", "CMS", "MMS", + "INS", "PTS", "PCS", "DEGS", "RADS", "GRADS", "TURNS", "MSECS", "SECS", + "HERZ", "KHERZ", "DIMEN", "PERCENTAGE", "FLOATTOKEN", "INTEGER", "URI", + "FUNCTION", "NOTFUNCTION", "UNICODERANGE", "VARCALL", "'{'", "'}'", + "';'", "'('", "')'", "','", "'+'", "'~'", "'>'", "'-'", "']'", "'='", + "'/'", "'#'", "'%'", "$accept", "stylesheet", "valid_rule_or_import", + "webkit_rule", "webkit_keyframe_rule", "webkit_decls", + "webkit_variables_decls", "webkit_value", "webkit_mediaquery", + "webkit_selector", "maybe_space", "maybe_sgml", "maybe_charset", + "closing_brace", "charset", "import_list", "variables_list", + "namespace_list", "rule_list", "valid_rule", "rule", "block_rule_list", + "block_valid_rule", "block_rule", "import", "variables_rule", + "variables_media_list", "variables_declaration_list", "variables_decl_list", "variables_declaration", "variable_name", "namespace", "maybe_ns_prefix", "string_or_uri", "media_feature", "maybe_media_value", "media_query_exp", "media_query_exp_list", @@ -816,47 +772,47 @@ static const char *const yytname[] = static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 58, 46, 91, 42, - 124, 271, 272, 273, 274, 275, 276, 277, 278, 279, + 265, 266, 267, 268, 269, 270, 271, 58, 46, 91, + 42, 124, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, - 310, 311, 312, 313, 314, 315, 316, 317, 318, 123, - 125, 59, 40, 41, 44, 43, 126, 62, 45, 93, - 61, 47, 35, 37 + 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, + 123, 125, 59, 40, 41, 44, 43, 126, 62, 45, + 93, 61, 47, 35, 37 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 84, 85, 85, 85, 85, 85, 85, 85, 85, - 86, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 94, 95, 95, 95, 96, 96, 97, 97, 98, 98, - 98, 99, 99, 99, 100, 100, 101, 101, 102, 102, - 103, 103, 103, 103, 103, 104, 104, 104, 104, 105, - 105, 106, 106, 106, 106, 107, 107, 107, 107, 107, - 108, 108, 108, 108, 109, 109, 110, 110, 111, 111, - 111, 111, 111, 111, 112, 112, 112, 112, 112, 112, - 112, 113, 113, 113, 113, 113, 113, 114, 115, 115, - 115, 116, 116, 117, 117, 118, 119, 119, 120, 121, - 121, 122, 122, 123, 123, 123, 124, 124, 125, 125, - 126, 126, 126, 127, 127, 128, 129, 130, 130, 131, - 131, 132, 133, 133, 134, 134, 135, 135, 136, 136, - 136, 137, 137, 137, 138, 138, 139, 140, 140, 140, - 141, 142, 142, 142, 142, 142, 143, 143, 143, 144, - 144, 144, 144, 144, 144, 145, 145, 146, 146, 146, - 147, 147, 147, 147, 147, 148, 149, 150, 150, 150, - 150, 151, 151, 151, 151, 151, 151, 152, 152, 153, - 153, 153, 153, 153, 153, 154, 154, 154, 154, 154, - 154, 154, 155, 155, 155, 155, 155, 155, 155, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 157, 158, - 158, 159, 159, 159, 160, 160, 160, 161, 161, 161, - 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + 0, 85, 86, 86, 86, 86, 86, 86, 86, 86, + 87, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 95, 96, 96, 96, 97, 97, 98, 98, 99, 99, + 99, 100, 100, 100, 101, 101, 102, 102, 103, 103, + 104, 104, 104, 104, 104, 105, 105, 105, 105, 106, + 106, 107, 107, 107, 107, 108, 108, 108, 108, 108, + 109, 109, 109, 109, 110, 110, 111, 111, 112, 112, + 112, 112, 112, 112, 113, 113, 113, 113, 113, 113, + 113, 114, 114, 114, 114, 114, 114, 115, 116, 116, + 116, 117, 117, 118, 118, 119, 120, 120, 121, 122, + 122, 123, 123, 124, 124, 124, 125, 125, 126, 126, + 127, 127, 127, 128, 128, 129, 130, 131, 131, 132, + 132, 133, 134, 134, 135, 135, 136, 136, 137, 137, + 137, 138, 138, 138, 139, 139, 140, 141, 141, 141, + 142, 143, 143, 143, 143, 143, 144, 144, 144, 145, + 145, 145, 145, 145, 145, 146, 146, 147, 147, 147, + 148, 148, 148, 148, 148, 149, 150, 151, 151, 151, + 151, 152, 152, 152, 152, 152, 152, 153, 153, 154, + 154, 154, 154, 154, 154, 155, 155, 155, 155, 155, + 155, 155, 156, 156, 156, 156, 156, 156, 156, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 158, 159, + 159, 160, 160, 160, 161, 161, 161, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 163, 164, 164, 165, 165, 166, 166, 167, 167, 168, - 168, 169, 170, 171, 172, 172, 173, 173 + 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, + 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, + 164, 165, 165, 166, 166, 167, 167, 168, 168, 169, + 169, 170, 171, 172, 173, 173, 174, 174 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -966,75 +922,75 @@ static const yytype_int16 yydefgoto[] = /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -299 +#define YYPACT_NINF -435 static const yytype_int16 yypact[] = { - 466, 425, -26, -20, 75, 118, 189, 139, 151, 263, - -299, -299, -299, -299, -299, -299, -299, -299, -299, 359, - 300, -299, -299, -299, -299, -299, -299, -299, -299, 278, - 278, 278, 278, 278, 278, 278, 33, 338, -299, -299, - -299, -299, 749, 313, 32, 1074, 12, 545, 44, -299, - -299, 345, 346, -299, 335, 223, 194, 354, -299, -299, - 419, 380, -299, 383, -299, 403, 408, -299, 163, -299, - -299, -299, -299, -299, -299, -299, -299, -299, 86, 561, - 199, 620, -299, 626, 161, -299, -299, -299, -299, 374, - -299, -299, -299, 351, 239, 378, 179, -299, -299, -299, - -299, -299, -299, -299, -299, -299, -299, -299, -299, -299, - -299, -299, -299, -299, -299, -299, -299, -299, -299, -299, - -299, -299, -299, -299, -299, -299, -299, -299, -299, -299, - -299, -299, -299, -299, -299, 645, 882, -299, -299, -299, - -299, -299, -299, -299, -299, -299, 30, -299, 363, 82, - 402, -299, 364, 185, 410, 190, 421, 28, -299, 301, - -299, -299, -299, -299, -299, 423, -299, -299, -299, 426, - 337, -299, -299, 35, -299, 542, 397, 640, 1, 691, - 26, 448, 220, -299, -299, -299, -299, -299, -299, -299, - -299, -299, 561, -299, -299, 626, 343, 381, -299, -299, - -299, 443, 278, 278, -299, 705, 377, 27, -299, 59, - -299, -299, -299, 278, 242, 178, 278, 278, 278, 278, - 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - 278, 278, 1012, 278, 278, 278, -299, -299, -299, -299, - -299, -299, 1132, 278, 201, 368, 312, -299, -299, -299, - 464, 278, -299, 706, 395, -299, 87, -299, -299, 188, - -299, -299, -299, -299, 442, -299, 301, 301, 223, -299, - 409, 413, 414, 545, 354, 383, 488, 69, -299, -299, - -299, -299, -299, -299, -299, -299, -299, 135, -299, -299, - -299, -299, -299, -299, -299, 313, 545, 278, 278, 278, - -299, 554, 278, 709, -299, 475, -299, 432, 278, -299, - 539, -299, -299, -299, -299, 947, 278, 278, 278, -299, - -299, -299, -299, -299, 462, 278, 712, -299, 528, -299, - 278, -299, 744, -299, 294, 165, 382, 1229, -299, 301, - -299, -299, -299, -299, -299, -299, 278, -299, 209, -299, - -299, -299, -299, -299, -299, -299, -299, 339, 278, -299, - -299, -299, 313, 257, 174, 210, -299, 278, 713, 278, - 278, 1132, 463, 313, 32, -299, 278, 42, 181, 278, - -299, -299, -299, 278, 754, 278, 278, 1132, 604, 313, - 467, 97, 531, 473, 764, 329, 432, -299, -299, -299, - -299, -299, -299, 301, 61, -299, -299, 458, 765, 1204, - 278, 12, 477, -299, -299, 278, -299, 463, -299, 172, - 478, -299, 278, -299, 479, -299, 181, 278, -299, 669, - 486, -299, 10, -299, -299, -299, 562, 217, -299, 301, - -299, 458, -299, -299, -299, -299, -299, 223, -299, -299, - -299, -299, -299, -299, -299, -299, -299, -299, -299, -299, - -299, 1204, -299, -299, 278, 278, -299, 278, -299, -299, - 1074, -299, 30, 278, -299, 44, 152, 44, -299, -299, - -299, 2, -299, 301, -299, 278, 307, 817, 278, 278, - 497, 504, 225, 15, -299, -299, -299, 278, -299, -299, - -299, -299, 278 + 818, 44, -36, -18, 112, 127, 66, 141, 162, 243, + -435, -435, -435, -435, -435, -435, -435, -435, -435, 239, + 43, -435, -435, -435, -435, -435, -435, -435, -435, 250, + 250, 250, 250, 250, 250, 250, 37, 304, -435, -435, + -435, -435, 763, 354, 31, 1114, 144, 622, 49, -435, + -435, 346, 344, -435, 332, 27, 23, 358, -435, -435, + 401, 370, -435, 371, -435, 381, 406, -435, 193, -435, + -435, -435, -435, -435, -435, -435, -435, -435, 171, 702, + 143, 631, -435, 756, 159, -435, -435, -435, -435, 240, + -435, -435, -435, 329, 303, 254, 199, -435, -435, -435, + -435, -435, -435, -435, -435, -435, -435, -435, -435, -435, + -435, -435, -435, -435, -435, -435, -435, -435, -435, -435, + -435, -435, -435, -435, -435, -435, -435, -435, -435, -435, + -435, -435, -435, -435, -435, 949, 903, -435, -435, -435, + -435, -435, -435, -435, -435, -435, 34, -435, 342, 4, + 274, -435, 353, 59, 291, 223, 331, 395, -435, 438, + -435, -435, -435, -435, -435, 437, -435, -435, -435, 448, + 24, -435, -435, 415, -435, 349, 295, 377, 375, 399, + 198, 421, 190, -435, -435, -435, -435, -435, -435, -435, + -435, -435, 702, -435, -435, 756, 334, 380, -435, -435, + -435, 463, 250, 250, -435, 409, 398, 180, -435, 15, + -435, -435, -435, 250, 221, 182, 250, 250, 250, 250, + 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, + 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, + 250, 250, 1052, 250, 250, 250, -435, -435, -435, -435, + -435, -435, 1172, 250, 188, 166, 301, -435, -435, -435, + 472, 250, -435, 412, 404, -435, 62, -435, -435, 220, + -435, -435, -435, -435, 458, -435, 438, 438, 27, -435, + 413, 417, 430, 622, 358, 371, 473, 158, -435, -435, + -435, -435, -435, -435, -435, -435, -435, 172, -435, -435, + -435, -435, -435, -435, -435, 354, 622, 250, 250, 250, + -435, 555, 250, 420, -435, 502, -435, 459, 250, -435, + 535, -435, -435, -435, -435, 976, 250, 250, 250, -435, + -435, -435, -435, -435, 496, 250, 423, -435, 541, -435, + 250, -435, 754, -435, 424, 36, 552, 685, -435, 438, + -435, -435, -435, -435, -435, -435, 250, -435, 277, -435, + -435, -435, -435, -435, -435, -435, -435, 856, 250, -435, + -435, -435, 354, 226, 65, 203, -435, 250, 428, 250, + 250, 1172, 462, 354, 31, -435, 250, 53, 186, 250, + -435, -435, -435, 250, 429, 250, 250, 1172, 608, 354, + 479, 83, 538, 485, 482, 320, 459, -435, -435, -435, + -435, -435, -435, 438, 78, -435, -435, 447, 489, 1244, + 250, 144, 487, -435, -435, 250, -435, 462, -435, 205, + 491, -435, 250, -435, 492, -435, 186, 250, -435, 681, + 497, -435, 5, -435, -435, -435, 558, 150, -435, 438, + -435, 447, -435, -435, -435, -435, -435, 27, -435, -435, + -435, -435, -435, -435, -435, -435, -435, -435, -435, -435, + -435, 1244, -435, -435, 250, 250, -435, 250, -435, -435, + 1114, -435, 34, 250, -435, 49, 178, 49, -435, -435, + -435, 1, -435, 438, -435, 250, 306, 827, 250, 250, + 498, 504, 151, 14, -435, -435, -435, 250, -435, -435, + -435, -435, 250 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -299, -299, -299, -299, -299, -299, -299, -299, -299, -299, - -1, -21, -299, -51, -299, -299, -299, -299, -299, 265, - -299, 200, -299, -299, 258, -299, -299, 352, -299, 472, - -299, -299, -299, 186, -299, -299, 238, 240, -299, -299, - -45, 279, -176, -238, -299, -194, -299, -299, 149, -299, - 293, -116, -66, -299, -299, -48, 663, -299, 429, 568, - -61, 661, -50, -55, -299, 460, -299, 391, 303, -299, - -298, -299, 692, -299, 330, -185, -299, 533, 675, -35, - -299, -299, 349, -19, -299, 469, -299, 470, -16, -3 + -435, -435, -435, -435, -435, -435, -435, -435, -435, -435, + -1, -21, -435, -51, -435, -435, -435, -435, -435, 229, + -435, 147, -435, -435, 256, -435, -435, -434, -435, 425, + -435, -435, -435, 130, -435, -435, 214, 174, -435, -435, + -45, 241, -176, -389, -435, -227, -435, -435, 116, -435, + 231, -154, -137, -435, -435, -130, 566, -435, 310, 449, + -61, 547, -50, -55, -435, 348, -435, 278, 194, -435, + -298, -435, 581, -435, 261, -185, -435, 443, 546, -35, + -435, -435, 218, -19, -435, 352, -435, 364, -16, -3 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1044,324 +1000,332 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -217 static const yytype_int16 yytable[] = { - 20, 148, 297, 39, 163, 40, 40, 374, 97, 29, - 30, 31, 32, 33, 34, 35, 40, 53, 186, 40, - 42, 43, 44, 45, 46, 47, 48, -191, 317, 199, - 40, 196, 159, 197, -19, 160, 40, 49, 50, 40, - 56, 142, 143, 21, 98, 150, 40, 284, 40, 22, - 142, 143, 142, 143, 285, 64, 151, 325, 433, 97, - 317, 173, 272, 273, 176, 40, 178, 180, 181, 182, - 295, 51, -19, 144, 422, 359, 360, 361, 362, 363, - 212, 504, 144, 183, 144, 430, 201, 183, 317, 202, - 203, 207, 209, 99, 511, 300, 213, -191, 369, 214, + 20, 148, 297, 39, 163, 183, 40, 374, 97, 29, + 30, 31, 32, 33, 34, 35, 317, 53, 186, 40, + 42, 43, 44, 45, 46, 47, 48, 161, 40, 199, + 461, 196, 159, 197, 21, 160, 40, 280, 281, -19, + 56, 40, 49, 50, 98, 19, 142, 143, 40, -19, + 150, 500, 22, 501, 40, 41, -19, 325, 40, 97, + 263, 173, 151, 317, 176, 161, 178, 180, 181, 182, + 433, 25, 151, 402, 422, 258, 51, -19, 144, 185, + 212, 504, 461, 40, 369, 430, 201, 319, 282, 202, + 203, 207, 209, 99, 511, 166, 213, 37, 162, 214, 215, 440, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, - 319, 310, 244, 245, 450, 382, 369, 276, 253, 277, - 271, 199, 199, 254, 23, 311, 256, 260, 364, 365, - 261, 266, 258, 369, 269, 184, 185, 398, 341, 289, - 185, 294, 198, 299, 179, -151, -109, -19, -109, 40, - 283, 371, -199, 478, 161, 58, 59, 60, 61, 62, - 210, 461, 40, 305, 306, 40, 263, 24, 307, 308, - 309, 267, 40, 25, -19, 211, 427, 151, 40, 312, - 187, 402, 315, 188, 370, 40, 268, 318, 26, 371, - 320, 187, 439, 330, 188, 359, 360, 361, 362, 363, - 27, -67, 355, 161, 40, 462, 371, 350, 290, 40, - -151, -151, -19, 461, -151, -151, -151, -151, -151, -187, - 205, -199, -199, -199, 162, 326, 40, 322, 37, 327, - 328, 90, 323, 144, 349, -70, 199, 343, 335, -19, - 338, 40, 351, 28, 340, 166, 486, 342, -137, -137, - 97, 344, 345, -137, 189, 190, 191, 462, 91, -138, - -138, 291, 40, 356, -138, 189, 190, 191, 415, 365, - 304, 367, 37, 162, 368, 497, 510, 351, 40, 372, - 72, 351, 373, 463, 40, 49, 50, 92, 37, -187, - 158, 41, 321, 377, 89, 379, 40, 40, 380, 98, - 351, 383, 384, 424, 333, 90, 423, 413, 410, 386, - 387, 388, 389, 40, 142, 143, 393, 97, 395, 55, - 396, 446, 399, 40, 198, 405, 156, -154, 97, 280, - 281, -103, 91, 464, 414, 463, 356, 58, 59, 60, - 61, 62, 351, -108, 97, 417, 144, 65, 99, 420, - 421, 465, 40, 51, 167, 425, 472, 505, 351, 142, - 143, 92, 198, 404, 432, -150, -19, 449, 445, 436, - 448, 437, 172, -19, -19, 58, 59, 60, 61, 62, - 282, 40, 456, 174, 175, 464, 492, -19, 290, 177, - 332, 144, -154, -154, -19, 451, -154, -154, -154, -154, - -154, 204, 474, 465, 278, 475, 19, 477, 37, -19, - 38, 168, 480, 257, 262, 169, -19, 483, 279, 493, - 485, 448, 487, 37, 313, 200, -19, 37, 316, 208, - -150, -150, 40, 491, -150, -150, -150, -150, -150, 301, - 302, 291, 40, -210, 248, 336, 339, -19, 346, 452, - 453, 37, 495, 259, -216, -216, 378, -216, -216, 37, - 498, 265, 352, 499, 170, 171, 353, 354, 502, 503, - 37, 1, 270, 2, 3, 4, 507, 5, 6, 7, - 357, 37, 428, 8, 390, 512, -216, -216, -216, -216, + -70, 310, 244, 245, 341, 382, 162, 276, 253, 277, + 271, 199, 199, 254, 187, 311, 256, 260, 188, 40, + 261, 266, 450, -109, 269, -109, 40, 398, 371, 289, + 198, 294, 290, 299, -151, 359, 360, 361, 362, 363, + 283, 40, 183, 369, 58, 59, 60, 61, 62, 369, + -191, 317, 23, 305, 306, 142, 143, 40, 307, 308, + 309, 40, 462, 40, 179, 40, 427, 24, -19, 312, + 210, 330, 315, 40, 187, -199, 478, 318, 188, 332, + 320, 26, 439, -137, -137, 291, 211, 144, -137, 189, + 190, 191, 355, 510, 267, 40, 40, 350, -19, -151, + -151, 40, 27, -151, -151, -151, -151, -151, 364, 365, + 268, 184, 370, 28, 462, 326, 185, 371, -67, 327, + 328, -191, 322, 371, 349, 40, 199, 323, 335, 144, + 338, 304, 351, -19, 340, 463, 486, 342, 300, 37, + 97, 344, 345, -138, -138, -199, -199, -199, -138, 189, + 190, 191, 464, 356, 359, 360, 361, 362, 363, 465, + 343, 367, 321, -19, 368, 497, 423, 351, 72, 372, + 40, 351, 373, -187, 205, 55, 40, 290, 158, 37, + 37, 38, 200, 377, 333, 379, 90, 463, 380, 98, + 351, 383, 384, 424, 37, 40, 208, 413, 410, 386, + 387, 388, 389, 446, 464, 198, 393, 97, 395, -154, + 396, 465, 399, 91, 37, 405, 259, 156, 97, 58, + 59, 60, 61, 62, 414, 89, 356, 415, 365, 40, + 291, 37, 351, 265, 97, 417, 65, 90, 99, 420, + 421, 51, 92, 37, -187, 425, 472, 505, 351, 167, + 40, 198, 175, 172, 432, -150, -19, 449, 445, 436, + 448, 437, 174, -19, 91, 58, 59, 60, 61, 62, + 204, 37, 456, 270, -154, -154, 492, 177, -154, -154, + -154, -154, -154, 257, 168, 451, 142, 143, 169, 37, + 40, 288, 474, 92, 262, 475, 40, 477, 284, 40, + 272, 273, 480, 301, 302, 285, 64, 483, 278, 493, + 485, 448, 487, 49, 50, 295, -19, 37, 144, 293, + -150, -150, 40, 491, -150, -150, -150, -150, -150, 452, + 453, 279, -210, 248, 313, 142, 143, 170, 171, 37, + 316, 298, 495, 336, -216, -216, 339, -216, -216, 37, + 498, 314, 37, 499, 337, 346, 357, 352, 502, 503, + 37, 353, 376, 37, -108, 392, 507, 144, 37, 37, + 426, 438, 428, 378, 354, 512, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, -216, -216, -216, -216, -216, -216, 394, - -216, -216, -210, -210, -210, 442, 441, 250, -216, -205, - 381, -216, 443, 40, 251, -216, -216, 473, 479, 40, - 103, 104, 481, 105, 106, 198, 484, 57, -153, 58, - 59, 60, 61, 62, 63, 64, 488, 508, 58, 59, - 60, 61, 62, 57, 509, 58, 59, 60, 61, 62, - 63, 64, 107, 108, 109, 110, 111, 112, 113, 114, - 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, 248, 130, 92, -205, -205, - -205, 37, 407, 288, 131, -216, -216, 132, -216, -216, - 471, 133, 134, -153, -153, 264, 435, -153, -153, -153, - -153, -153, 193, 489, 58, 59, 60, 61, 62, 194, - 58, 59, 60, 61, 62, 506, 418, -216, -216, -216, + -216, -216, -216, -216, -216, -216, -216, -216, -216, 37, + -216, -216, -210, -210, -210, -205, 381, 250, -216, 390, + 40, -216, 394, 442, 251, -216, -216, 103, 104, 441, + 105, 106, 37, 404, 444, 443, 198, -19, 473, 37, + -153, 455, 479, 488, -19, -19, 481, 471, 484, 508, + 58, 59, 60, 61, 62, 509, 407, 489, 264, 107, + 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, + 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, + 128, 129, 435, 130, 92, -205, -205, -205, 418, 248, + 482, 131, 506, 149, 132, 431, 375, -19, 133, 134, + -216, -216, 286, -216, -216, -153, -153, 40, 195, -153, + -153, -153, -153, -153, 358, 57, 416, 58, 59, 60, + 61, 62, 63, 64, 193, 490, 58, 59, 60, 61, + 62, 194, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, + -216, -216, -216, -216, -216, 206, -216, -216, -81, -81, + -81, 247, 248, 250, -216, -2, 406, -216, 476, 494, + 251, -216, -216, -216, -216, 329, -216, -216, 57, 411, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 412, 0, 0, 0, 57, 69, 58, 59, 60, + 61, 62, 63, 64, 51, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - 248, -216, -216, -81, -81, -81, 482, 431, 250, -216, - -216, -216, -216, -216, -216, 251, -216, -216, 107, 108, + -216, -216, -216, -216, -216, -216, -216, -216, 0, -216, + -216, -84, -84, -84, 0, 397, 250, -216, 0, 40, + -216, 0, 0, 251, -216, -216, 103, 104, 40, 105, + 106, 58, 59, 60, 61, 62, 57, 0, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 0, + 0, 0, 0, 0, 69, 0, 0, 0, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 246, 125, 126, 127, 37, - 149, 293, -216, -216, -216, -216, -216, -216, -216, -216, + 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, + 129, 0, 130, 92, -85, -85, -85, 0, 248, 0, + 131, 0, -19, 132, 0, 0, 0, 133, 134, -216, + -216, 0, -216, -216, 1, 0, 2, 3, 4, 0, + 5, 6, 7, 0, 0, 0, 8, 0, 0, 0, + 0, 40, 0, 0, 0, 0, 0, 0, 0, -103, + 0, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, -216, -216, 375, -216, -216, -84, -84, - -84, 286, 195, 250, -216, 397, 358, -216, 40, 416, - 251, -216, -216, 40, 490, 103, 104, 476, 105, 106, - 37, 57, 298, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 67, 68, 37, 37, 314, 337, 37, 69, - 376, 37, 37, 392, 426, 329, 206, 107, 108, 109, - 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 247, 130, 92, -85, -85, -85, 411, 412, 248, 131, - 494, -19, 132, 37, 0, 438, 133, 134, -216, -216, - 0, -216, -216, 37, 37, 444, 455, 500, 0, 501, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + -216, -216, -216, -216, 0, -216, -216, 142, 143, 0, + 0, -19, 250, -216, 248, 0, -216, 0, 0, 251, + -216, -216, 0, 0, 0, -216, -216, 0, -216, -216, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, 248, -216, -216, 0, 0, 0, 0, - -19, 250, -216, -216, -216, -216, -216, -216, 251, -216, - -216, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -216, -216, -216, -216, -216, + 0, -216, -216, 0, 249, 0, 0, 248, 250, -216, + 0, 0, -216, 0, 0, 251, -216, -216, -216, -216, + 0, -216, -216, 107, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, + 246, 125, 126, 127, 0, 0, 0, 0, 0, 0, + -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, -216, -216, -216, -216, -216, 248, -216, - -216, 0, 249, 0, 0, 0, 250, -216, -216, -216, - -216, -216, -216, 251, -216, -216, 0, 0, 0, 0, + -216, -216, -216, 0, -216, -216, 0, 0, 0, 0, + 385, 250, -216, 324, 0, -216, 0, 40, 251, -216, + -216, 0, 0, 0, 103, 104, 0, 105, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, 324, -216, -216, 40, 0, 0, 0, - 385, 250, -216, 103, 104, -216, 105, 106, 251, -216, - -216, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 107, 108, 109, 110, + 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, + 121, 122, 123, 124, 125, 126, 127, 128, 129, 40, + 130, 92, 0, 0, 0, 0, 103, 104, 131, 105, + 106, 132, 0, 0, 0, 133, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 107, 108, 109, 110, 111, - 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 127, 128, 129, 40, 130, - 92, 0, 0, 0, 0, 103, 104, 131, 105, 106, - 132, 0, 0, 0, 133, 134, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 107, 108, + 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, + 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, + 129, 0, 130, 92, 103, 104, 0, 105, 106, 0, + 131, 0, 0, 132, 0, 0, 0, 133, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 107, 108, 109, - 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 0, 130, 92, 103, 104, 0, 105, 106, 0, 131, - 0, 0, 132, 0, 0, 0, 133, 134, 0, 0, + 0, 0, 0, 0, 0, 0, 107, 108, 109, 110, + 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, + 121, 122, 123, 124, 125, 126, 127, 128, 129, 0, + 130, 92, 0, 0, 161, 457, 0, 0, 131, 0, + 0, 132, 0, 0, 0, 133, 134, 57, 0, 58, + 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, + 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, + 0, 0, 0, 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 107, 108, 109, 110, 111, - 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 127, 128, 129, 0, 130, - 92, 0, 0, 0, 161, 457, 0, 131, 0, 0, - 132, 0, 0, 0, 133, 134, 57, 0, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, -2, - 406, 0, 0, 0, 69, 0, 0, 0, 0, 0, - 0, 57, 51, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 67, 68, 0, 0, 0, 0, 0, 69, - 0, 0, 0, 0, 0, 0, 0, 51, 0, 0, - 0, 0, 0, 0, 162 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 162 }; static const yytype_int16 yycheck[] = { - 1, 46, 178, 19, 55, 4, 4, 305, 43, 10, - 11, 12, 13, 14, 15, 16, 4, 36, 79, 4, - 21, 22, 23, 24, 25, 26, 27, 0, 1, 84, - 4, 81, 53, 83, 4, 54, 4, 4, 5, 4, - 41, 40, 41, 69, 12, 1, 4, 12, 4, 69, - 40, 41, 40, 41, 19, 20, 12, 242, 16, 94, - 1, 62, 34, 35, 65, 4, 67, 68, 69, 70, - 69, 38, 42, 72, 372, 6, 7, 8, 9, 10, - 96, 79, 72, 1, 72, 383, 89, 1, 1, 90, - 91, 94, 95, 61, 79, 69, 97, 70, 1, 100, + 1, 46, 178, 19, 55, 1, 5, 305, 43, 10, + 11, 12, 13, 14, 15, 16, 1, 36, 79, 5, + 21, 22, 23, 24, 25, 26, 27, 0, 5, 84, + 419, 81, 53, 83, 70, 54, 5, 13, 14, 5, + 41, 5, 5, 6, 13, 1, 41, 42, 5, 5, + 1, 485, 70, 487, 5, 12, 12, 242, 5, 94, + 1, 62, 13, 1, 65, 0, 67, 68, 69, 70, + 17, 5, 13, 37, 372, 71, 39, 43, 73, 75, + 96, 80, 471, 5, 1, 383, 89, 72, 64, 90, + 91, 94, 95, 62, 80, 72, 97, 70, 71, 100, 101, 399, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, - 71, 192, 133, 134, 73, 320, 1, 158, 139, 160, - 156, 196, 197, 144, 69, 195, 147, 150, 79, 80, - 151, 154, 70, 1, 155, 69, 74, 342, 71, 175, - 74, 177, 1, 179, 1, 4, 69, 4, 71, 4, - 171, 74, 0, 1, 0, 14, 15, 16, 17, 18, - 1, 419, 4, 184, 185, 4, 1, 69, 189, 190, - 191, 1, 4, 4, 4, 16, 381, 12, 4, 200, - 1, 36, 205, 4, 69, 4, 16, 208, 69, 74, - 211, 1, 397, 12, 4, 6, 7, 8, 9, 10, - 69, 69, 283, 0, 4, 419, 74, 278, 11, 4, - 69, 70, 69, 471, 73, 74, 75, 76, 77, 0, - 1, 69, 70, 71, 70, 246, 4, 69, 69, 250, - 251, 12, 74, 72, 275, 70, 311, 69, 259, 69, - 263, 4, 278, 0, 265, 71, 442, 268, 69, 70, - 305, 272, 273, 74, 75, 76, 77, 471, 39, 69, - 70, 64, 4, 284, 74, 75, 76, 77, 79, 80, - 70, 292, 69, 70, 295, 480, 71, 313, 4, 300, - 42, 317, 303, 419, 4, 4, 5, 68, 69, 70, - 52, 11, 70, 314, 1, 316, 4, 4, 319, 12, - 336, 322, 323, 374, 12, 12, 69, 348, 347, 330, - 331, 332, 333, 4, 40, 41, 337, 372, 339, 1, - 341, 12, 343, 4, 1, 346, 1, 4, 383, 12, - 13, 12, 39, 419, 355, 471, 357, 14, 15, 16, - 17, 18, 378, 69, 399, 366, 72, 21, 61, 370, - 371, 419, 4, 38, 20, 376, 421, 70, 394, 40, - 41, 68, 1, 1, 385, 4, 4, 408, 404, 390, - 406, 392, 12, 11, 12, 14, 15, 16, 17, 18, - 63, 4, 418, 20, 1, 471, 457, 4, 11, 1, - 42, 72, 69, 70, 11, 416, 73, 74, 75, 76, - 77, 70, 423, 471, 1, 426, 1, 428, 69, 4, - 71, 12, 433, 70, 70, 16, 11, 438, 12, 460, - 441, 457, 443, 69, 1, 71, 64, 69, 71, 71, - 69, 70, 4, 454, 73, 74, 75, 76, 77, 11, - 12, 64, 4, 0, 1, 1, 71, 64, 26, 11, - 12, 69, 473, 71, 11, 12, 1, 14, 15, 69, - 481, 71, 73, 484, 65, 66, 73, 73, 489, 490, - 69, 25, 71, 27, 28, 29, 497, 31, 32, 33, - 12, 69, 39, 37, 42, 506, 43, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, 64, 65, 1, - 67, 68, 69, 70, 71, 4, 69, 74, 75, 0, - 1, 78, 69, 4, 81, 82, 83, 70, 70, 4, - 11, 12, 73, 14, 15, 1, 70, 12, 4, 14, - 15, 16, 17, 18, 19, 20, 4, 70, 14, 15, - 16, 17, 18, 12, 70, 14, 15, 16, 17, 18, - 19, 20, 43, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, - 61, 62, 63, 64, 65, 1, 67, 68, 69, 70, - 71, 69, 347, 71, 75, 11, 12, 78, 14, 15, - 420, 82, 83, 69, 70, 153, 388, 73, 74, 75, - 76, 77, 12, 447, 14, 15, 16, 17, 18, 19, - 14, 15, 16, 17, 18, 496, 367, 43, 44, 45, - 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 1, 67, 68, 69, 70, 71, 436, 384, 74, 75, - 11, 12, 78, 14, 15, 81, 82, 83, 43, 44, + 71, 192, 133, 134, 72, 320, 71, 158, 139, 160, + 156, 196, 197, 144, 1, 195, 147, 150, 5, 5, + 151, 154, 74, 70, 155, 72, 5, 342, 75, 175, + 1, 177, 12, 179, 5, 7, 8, 9, 10, 11, + 171, 5, 1, 1, 15, 16, 17, 18, 19, 1, + 0, 1, 70, 184, 185, 41, 42, 5, 189, 190, + 191, 5, 419, 5, 1, 5, 381, 70, 5, 200, + 1, 13, 205, 5, 1, 0, 1, 208, 5, 43, + 211, 70, 397, 70, 71, 65, 17, 73, 75, 76, + 77, 78, 283, 72, 1, 5, 5, 278, 5, 70, + 71, 5, 70, 74, 75, 76, 77, 78, 80, 81, + 17, 70, 70, 0, 471, 246, 75, 75, 70, 250, + 251, 71, 70, 75, 275, 5, 311, 75, 259, 73, + 263, 71, 278, 70, 265, 419, 442, 268, 70, 70, + 305, 272, 273, 70, 71, 70, 71, 72, 75, 76, + 77, 78, 419, 284, 7, 8, 9, 10, 11, 419, + 70, 292, 71, 70, 295, 480, 70, 313, 42, 300, + 5, 317, 303, 0, 1, 1, 5, 12, 52, 70, + 70, 72, 72, 314, 13, 316, 13, 471, 319, 13, + 336, 322, 323, 374, 70, 5, 72, 348, 347, 330, + 331, 332, 333, 13, 471, 1, 337, 372, 339, 5, + 341, 471, 343, 40, 70, 346, 72, 1, 383, 15, + 16, 17, 18, 19, 355, 1, 357, 80, 81, 5, + 65, 70, 378, 72, 399, 366, 22, 13, 62, 370, + 371, 39, 69, 70, 71, 376, 421, 71, 394, 21, + 5, 1, 1, 13, 385, 5, 5, 408, 404, 390, + 406, 392, 21, 12, 40, 15, 16, 17, 18, 19, + 71, 70, 418, 72, 70, 71, 457, 1, 74, 75, + 76, 77, 78, 71, 13, 416, 41, 42, 17, 70, + 5, 72, 423, 69, 71, 426, 5, 428, 13, 5, + 35, 36, 433, 12, 13, 20, 21, 438, 1, 460, + 441, 457, 443, 5, 6, 70, 65, 70, 73, 72, + 70, 71, 5, 454, 74, 75, 76, 77, 78, 12, + 13, 13, 0, 1, 1, 41, 42, 66, 67, 70, + 72, 72, 473, 1, 12, 13, 72, 15, 16, 70, + 481, 72, 70, 484, 72, 27, 13, 74, 489, 490, + 70, 74, 72, 70, 70, 72, 497, 73, 70, 70, + 72, 72, 40, 1, 74, 506, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 70, + 68, 69, 70, 71, 72, 0, 1, 75, 76, 43, + 5, 79, 1, 5, 82, 83, 84, 12, 13, 70, + 15, 16, 70, 1, 72, 70, 1, 5, 71, 70, + 5, 72, 71, 5, 12, 13, 74, 420, 71, 71, + 15, 16, 17, 18, 19, 71, 347, 447, 153, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, 61, 62, 63, 69, - 47, 71, 43, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, - 61, 62, 63, 64, 65, 306, 67, 68, 69, 70, - 71, 173, 81, 74, 75, 1, 286, 78, 4, 358, - 81, 82, 83, 4, 451, 11, 12, 427, 14, 15, - 69, 12, 71, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 69, 69, 71, 71, 69, 30, - 71, 69, 69, 71, 71, 252, 94, 43, 44, 45, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 388, 68, 69, 70, 71, 72, 367, 1, + 436, 76, 496, 47, 79, 384, 306, 65, 83, 84, + 12, 13, 173, 15, 16, 70, 71, 5, 81, 74, + 75, 76, 77, 78, 286, 13, 358, 15, 16, 17, + 18, 19, 20, 21, 13, 451, 15, 16, 17, 18, + 19, 20, 44, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 94, 68, 69, 70, 71, + 72, 135, 1, 75, 76, 0, 1, 79, 427, 471, + 82, 83, 84, 12, 13, 252, 15, 16, 13, 347, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 347, -1, -1, -1, 13, 31, 15, 16, 17, + 18, 19, 20, 21, 39, 44, 45, 46, 47, 48, + 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, + 59, 60, 61, 62, 63, 64, 65, 66, -1, 68, + 69, 70, 71, 72, -1, 1, 75, 76, -1, 5, + 79, -1, -1, 82, 83, 84, 12, 13, 5, 15, + 16, 15, 16, 17, 18, 19, 13, -1, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, + -1, -1, -1, -1, 31, -1, -1, -1, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 135, 67, 68, 69, 70, 71, 347, 347, 1, 75, - 471, 4, 78, 69, -1, 71, 82, 83, 11, 12, - -1, 14, 15, 69, 69, 71, 71, 485, -1, 487, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, + 66, -1, 68, 69, 70, 71, 72, -1, 1, -1, + 76, -1, 5, 79, -1, -1, -1, 83, 84, 12, + 13, -1, 15, 16, 26, -1, 28, 29, 30, -1, + 32, 33, 34, -1, -1, -1, 38, -1, -1, -1, + -1, 5, -1, -1, -1, -1, -1, -1, -1, 13, + -1, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, - 63, 64, 65, 1, 67, 68, -1, -1, -1, -1, - 73, 74, 75, 11, 12, 78, 14, 15, 81, 82, - 83, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 63, 64, 65, 66, -1, 68, 69, 41, 42, -1, + -1, 74, 75, 76, 1, -1, 79, -1, -1, 82, + 83, 84, -1, -1, -1, 12, 13, -1, 15, 16, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 73, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 43, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 1, 67, - 68, -1, 70, -1, -1, -1, 74, 75, 11, 12, - 78, 14, 15, 81, 82, 83, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 44, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, + -1, 68, 69, -1, 71, -1, -1, 1, 75, 76, + -1, -1, 79, -1, -1, 82, 83, 84, 12, 13, + -1, 15, 16, 44, 45, 46, 47, 48, 49, 50, + 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, 62, 63, 64, -1, -1, -1, -1, -1, -1, + 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, + 64, 65, 66, -1, 68, 69, -1, -1, -1, -1, + 74, 75, 76, 1, -1, 79, -1, 5, 82, 83, + 84, -1, -1, -1, 12, 13, -1, 15, 16, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, - 63, 64, 65, 1, 67, 68, 4, -1, -1, -1, - 73, 74, 75, 11, 12, 78, 14, 15, 81, 82, - 83, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 43, 44, 45, 46, 47, + -1, -1, -1, -1, -1, -1, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 4, 67, - 68, -1, -1, -1, -1, 11, 12, 75, 14, 15, - 78, -1, -1, -1, 82, 83, -1, -1, -1, -1, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 5, + 68, 69, -1, -1, -1, -1, 12, 13, 76, 15, + 16, 79, -1, -1, -1, 83, 84, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 43, 44, 45, + -1, -1, -1, -1, -1, -1, -1, -1, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - -1, 67, 68, 11, 12, -1, 14, 15, -1, 75, - -1, -1, 78, -1, -1, -1, 82, 83, -1, -1, + 66, -1, 68, 69, 12, 13, -1, 15, 16, -1, + 76, -1, -1, 79, -1, -1, -1, 83, 84, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 43, 44, 45, 46, 47, + -1, -1, -1, -1, -1, -1, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, -1, 67, - 68, -1, -1, -1, 0, 1, -1, 75, -1, -1, - 78, -1, -1, -1, 82, 83, 12, -1, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, - 1, -1, -1, -1, 30, -1, -1, -1, -1, -1, - -1, 12, 38, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, -1, -1, -1, -1, -1, 30, - -1, -1, -1, -1, -1, -1, -1, 38, -1, -1, - -1, -1, -1, -1, 70 + 58, 59, 60, 61, 62, 63, 64, 65, 66, -1, + 68, 69, -1, -1, 0, 1, -1, -1, 76, -1, + -1, 79, -1, -1, -1, 83, 84, 13, -1, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + -1, -1, -1, -1, -1, 31, -1, -1, -1, -1, + -1, -1, -1, 39, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 71 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 25, 27, 28, 29, 31, 32, 33, 37, 85, - 87, 88, 89, 90, 91, 92, 93, 96, 98, 1, - 94, 69, 69, 69, 69, 4, 69, 69, 0, 94, - 94, 94, 94, 94, 94, 94, 95, 69, 71, 172, - 4, 11, 94, 94, 94, 94, 94, 94, 94, 4, - 5, 38, 99, 167, 168, 1, 94, 12, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 30, - 86, 103, 108, 127, 129, 135, 136, 139, 140, 141, - 142, 143, 144, 145, 146, 147, 148, 150, 153, 1, - 12, 39, 68, 154, 155, 156, 157, 163, 12, 61, - 132, 133, 134, 11, 12, 14, 15, 43, 44, 45, - 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 67, 75, 78, 82, 83, 138, 159, 161, 162, 163, - 164, 165, 40, 41, 72, 120, 121, 123, 124, 140, - 1, 12, 111, 112, 113, 114, 1, 100, 108, 95, - 167, 0, 70, 97, 172, 173, 71, 20, 12, 16, - 65, 66, 12, 94, 20, 1, 94, 1, 94, 1, - 94, 94, 94, 1, 69, 74, 144, 1, 4, 75, - 76, 77, 137, 12, 19, 145, 146, 146, 1, 147, - 71, 173, 94, 94, 70, 1, 156, 173, 71, 173, - 1, 16, 172, 94, 94, 94, 94, 94, 94, 94, - 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, - 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, - 94, 94, 94, 94, 94, 94, 60, 162, 1, 70, - 74, 81, 160, 94, 94, 94, 94, 70, 70, 71, - 173, 94, 70, 1, 113, 71, 173, 1, 16, 94, - 71, 172, 34, 35, 101, 109, 95, 95, 1, 12, - 12, 13, 63, 94, 12, 19, 143, 149, 71, 172, - 11, 64, 117, 71, 172, 69, 124, 126, 71, 172, - 69, 11, 12, 130, 70, 94, 94, 94, 94, 94, - 144, 146, 94, 1, 71, 173, 71, 1, 94, 71, - 94, 70, 69, 74, 1, 159, 94, 94, 94, 161, - 12, 118, 42, 12, 128, 94, 1, 71, 173, 71, - 94, 71, 94, 69, 94, 94, 26, 102, 115, 95, - 97, 172, 73, 73, 73, 144, 94, 12, 149, 6, - 7, 8, 9, 10, 79, 80, 151, 94, 94, 1, - 69, 74, 94, 94, 154, 142, 71, 94, 1, 94, - 94, 1, 159, 94, 94, 73, 94, 94, 94, 94, - 42, 122, 71, 94, 1, 94, 94, 1, 159, 94, - 125, 126, 36, 110, 1, 94, 1, 103, 104, 108, - 167, 169, 171, 95, 94, 79, 151, 94, 125, 105, - 94, 94, 154, 69, 97, 94, 71, 159, 39, 158, - 154, 134, 94, 16, 119, 120, 94, 94, 71, 159, - 154, 69, 4, 69, 71, 172, 12, 116, 172, 95, - 73, 94, 11, 12, 152, 71, 172, 1, 97, 106, - 107, 127, 129, 135, 136, 139, 166, 167, 169, 170, - 171, 105, 124, 70, 94, 94, 158, 94, 1, 70, - 94, 73, 121, 94, 70, 94, 126, 94, 4, 117, - 152, 94, 97, 95, 166, 94, 131, 159, 94, 94, - 111, 111, 94, 94, 79, 70, 132, 94, 70, 70, - 71, 79, 94 + 0, 26, 28, 29, 30, 32, 33, 34, 38, 86, + 88, 89, 90, 91, 92, 93, 94, 97, 99, 1, + 95, 70, 70, 70, 70, 5, 70, 70, 0, 95, + 95, 95, 95, 95, 95, 95, 96, 70, 72, 173, + 5, 12, 95, 95, 95, 95, 95, 95, 95, 5, + 6, 39, 100, 168, 169, 1, 95, 13, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 31, + 87, 104, 109, 128, 130, 136, 137, 140, 141, 142, + 143, 144, 145, 146, 147, 148, 149, 151, 154, 1, + 13, 40, 69, 155, 156, 157, 158, 164, 13, 62, + 133, 134, 135, 12, 13, 15, 16, 44, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, + 68, 76, 79, 83, 84, 139, 160, 162, 163, 164, + 165, 166, 41, 42, 73, 121, 122, 124, 125, 141, + 1, 13, 112, 113, 114, 115, 1, 101, 109, 96, + 168, 0, 71, 98, 173, 174, 72, 21, 13, 17, + 66, 67, 13, 95, 21, 1, 95, 1, 95, 1, + 95, 95, 95, 1, 70, 75, 145, 1, 5, 76, + 77, 78, 138, 13, 20, 146, 147, 147, 1, 148, + 72, 174, 95, 95, 71, 1, 157, 174, 72, 174, + 1, 17, 173, 95, 95, 95, 95, 95, 95, 95, + 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, + 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, + 95, 95, 95, 95, 95, 95, 61, 163, 1, 71, + 75, 82, 161, 95, 95, 95, 95, 71, 71, 72, + 174, 95, 71, 1, 114, 72, 174, 1, 17, 95, + 72, 173, 35, 36, 102, 110, 96, 96, 1, 13, + 13, 14, 64, 95, 13, 20, 144, 150, 72, 173, + 12, 65, 118, 72, 173, 70, 125, 127, 72, 173, + 70, 12, 13, 131, 71, 95, 95, 95, 95, 95, + 145, 147, 95, 1, 72, 174, 72, 1, 95, 72, + 95, 71, 70, 75, 1, 160, 95, 95, 95, 162, + 13, 119, 43, 13, 129, 95, 1, 72, 174, 72, + 95, 72, 95, 70, 95, 95, 27, 103, 116, 96, + 98, 173, 74, 74, 74, 145, 95, 13, 150, 7, + 8, 9, 10, 11, 80, 81, 152, 95, 95, 1, + 70, 75, 95, 95, 155, 143, 72, 95, 1, 95, + 95, 1, 160, 95, 95, 74, 95, 95, 95, 95, + 43, 123, 72, 95, 1, 95, 95, 1, 160, 95, + 126, 127, 37, 111, 1, 95, 1, 104, 105, 109, + 168, 170, 172, 96, 95, 80, 152, 95, 126, 106, + 95, 95, 155, 70, 98, 95, 72, 160, 40, 159, + 155, 135, 95, 17, 120, 121, 95, 95, 72, 160, + 155, 70, 5, 70, 72, 173, 13, 117, 173, 96, + 74, 95, 12, 13, 153, 72, 173, 1, 98, 107, + 108, 128, 130, 136, 137, 140, 167, 168, 170, 171, + 172, 106, 125, 71, 95, 95, 159, 95, 1, 71, + 95, 74, 122, 95, 71, 95, 127, 95, 5, 118, + 153, 95, 98, 96, 167, 95, 132, 160, 95, 95, + 112, 112, 95, 95, 80, 71, 133, 95, 71, 71, + 72, 80, 95 }; #define yyerrok (yyerrstatus = 0) @@ -1546,17 +1510,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) +yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) #else static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; +yy_stack_print (yybottom, yytop) + yytype_int16 *yybottom; + yytype_int16 *yytop; #endif { YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } YYFPRINTF (stderr, "\n"); } @@ -1590,11 +1557,11 @@ yy_reduce_print (yyvsp, yyrule) /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - fprintf (stderr, " $%d = ", yyi + 1); + YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], &(yyvsp[(yyi + 1) - (yynrhs)]) ); - fprintf (stderr, "\n"); + YYFPRINTF (stderr, "\n"); } } @@ -1874,10 +1841,8 @@ yydestruct (yymsg, yytype, yyvaluep) break; } } - /* Prevent warnings from -Wmissing-prototypes. */ - #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus int yyparse (void *YYPARSE_PARAM); @@ -1896,10 +1861,9 @@ int yyparse (); - -/*----------. -| yyparse. | -`----------*/ +/*-------------------------. +| yyparse or yypush_parse. | +`-------------------------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1923,74 +1887,75 @@ yyparse () #endif #endif { - /* The look-ahead symbol. */ +/* The lookahead symbol. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; -/* Number of syntax errors so far. */ -int yynerrs; - - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif - - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ + /* Number of syntax errors so far. */ + int yynerrs; - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; + int yystate; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + /* The stacks and their tools: + `yyss': related to states. + `yyvs': related to semantic values. + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss; + yytype_int16 *yyssp; -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs; + YYSTYPE *yyvsp; - YYSIZE_T yystacksize = YYINITDEPTH; + YYSIZE_T yystacksize; + int yyn; + int yyresult; + /* Lookahead token as an internal (translated) token number. */ + int yytoken; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; + yytoken = 0; + yyss = yyssa; + yyvs = yyvsa; + yystacksize = YYINITDEPTH; + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ + yychar = YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack so that they stay on the same level as the state stack. The wasted elements are never initialized. */ - yyssp = yyss; yyvsp = yyvs; @@ -2020,7 +1985,6 @@ int yynerrs; YYSTYPE *yyvs1 = yyvs; yytype_int16 *yyss1 = yyss; - /* Each stack pointer address is followed by the size of the data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might @@ -2028,7 +1992,6 @@ int yynerrs; yyoverflow (YY_("memory exhausted"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), - &yystacksize); yyss = yyss1; @@ -2051,9 +2014,8 @@ int yynerrs; (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); @@ -2064,7 +2026,6 @@ int yynerrs; yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; - YYDPRINTF ((stderr, "Stack size increased to %lu\n", (unsigned long int) yystacksize)); @@ -2074,6 +2035,9 @@ int yynerrs; YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + if (yystate == YYFINAL) + YYACCEPT; + goto yybackup; /*-----------. @@ -2082,16 +2046,16 @@ int yynerrs; yybackup: /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ + lookahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to look-ahead token. */ + /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -2123,20 +2087,16 @@ yybackup: goto yyreduce; } - if (yyn == YYFINAL) - YYACCEPT; - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; - /* Shift the look-ahead token. */ + /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; + /* Discard the shifted token. */ + yychar = YYEMPTY; yystate = yyn; *++yyvsp = yylval; @@ -2176,35 +2136,45 @@ yyreduce: switch (yyn) { case 12: -#line 279 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 282 "../css/CSSGrammar.y" { static_cast<CSSParser*>(parser)->m_rule = (yyvsp[(4) - (6)].rule); ;} break; case 13: -#line 285 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 288 "../css/CSSGrammar.y" { static_cast<CSSParser*>(parser)->m_keyframe = (yyvsp[(4) - (6)].keyframeRule); ;} break; case 14: -#line 291 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 294 "../css/CSSGrammar.y" { /* can be empty */ ;} break; case 15: -#line 297 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 300 "../css/CSSGrammar.y" { /* can be empty */ ;} break; case 16: -#line 303 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 306 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); if ((yyvsp[(4) - (5)].valueList)) { @@ -2219,7 +2189,9 @@ yyreduce: break; case 17: -#line 317 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 320 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); p->m_mediaQuery = p->sinkFloatingMediaQuery((yyvsp[(4) - (5)].mediaQuery)); @@ -2227,7 +2199,9 @@ yyreduce: break; case 18: -#line 324 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 327 "../css/CSSGrammar.y" { if ((yyvsp[(4) - (5)].selectorList)) { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2238,13 +2212,17 @@ yyreduce: break; case 25: -#line 346 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 349 "../css/CSSGrammar.y" { ;} break; case 28: -#line 356 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 359 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); (yyval.rule) = static_cast<CSSParser*>(parser)->createCharsetRule((yyvsp[(3) - (5)].string)); @@ -2254,19 +2232,25 @@ yyreduce: break; case 29: -#line 362 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 365 "../css/CSSGrammar.y" { ;} break; case 30: -#line 364 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 367 "../css/CSSGrammar.y" { ;} break; case 32: -#line 370 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 373 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); if ((yyvsp[(2) - (3)].rule) && p->m_styleSheet) @@ -2275,13 +2259,17 @@ yyreduce: break; case 33: -#line 375 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 378 "../css/CSSGrammar.y" { ;} break; case 35: -#line 381 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 384 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); if ((yyvsp[(2) - (3)].rule) && p->m_styleSheet) @@ -2290,7 +2278,9 @@ yyreduce: break; case 39: -#line 395 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 398 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); if ((yyvsp[(2) - (3)].rule) && p->m_styleSheet) @@ -2299,12 +2289,16 @@ yyreduce: break; case 49: -#line 418 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 421 "../css/CSSGrammar.y" { (yyval.ruleList) = 0; ;} break; case 50: -#line 419 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 422 "../css/CSSGrammar.y" { (yyval.ruleList) = (yyvsp[(1) - (3)].ruleList); if ((yyvsp[(2) - (3)].rule)) { @@ -2316,70 +2310,90 @@ yyreduce: break; case 60: -#line 446 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 449 "../css/CSSGrammar.y" { (yyval.rule) = static_cast<CSSParser*>(parser)->createImportRule((yyvsp[(3) - (6)].string), (yyvsp[(5) - (6)].mediaList)); ;} break; case 61: -#line 449 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 452 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 62: -#line 452 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 455 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 63: -#line 455 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 458 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 64: -#line 461 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 464 "../css/CSSGrammar.y" { (yyval.rule) = static_cast<CSSParser*>(parser)->createVariablesRule((yyvsp[(3) - (7)].mediaList), true); ;} break; case 65: -#line 465 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 468 "../css/CSSGrammar.y" { (yyval.rule) = static_cast<CSSParser*>(parser)->createVariablesRule((yyvsp[(3) - (7)].mediaList), false); ;} break; case 66: -#line 471 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 474 "../css/CSSGrammar.y" { (yyval.mediaList) = static_cast<CSSParser*>(parser)->createMediaList(); ;} break; case 67: -#line 475 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 478 "../css/CSSGrammar.y" { (yyval.mediaList) = (yyvsp[(3) - (3)].mediaList); ;} break; case 68: -#line 481 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 484 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (1)].boolean); ;} break; case 69: -#line 484 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 487 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); if ((yyvsp[(2) - (2)].boolean)) @@ -2388,63 +2402,81 @@ yyreduce: break; case 70: -#line 489 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 492 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (1)].boolean); ;} break; case 71: -#line 492 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 495 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 72: -#line 495 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 498 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 73: -#line 498 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 501 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); ;} break; case 74: -#line 504 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 507 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (3)].boolean); ;} break; case 75: -#line 507 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 510 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 76: -#line 510 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 513 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 77: -#line 513 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 516 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 78: -#line 516 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 519 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (4)].boolean); if ((yyvsp[(2) - (4)].boolean)) @@ -2453,49 +2485,63 @@ yyreduce: break; case 79: -#line 521 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 524 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (4)].boolean); ;} break; case 80: -#line 524 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 527 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (6)].boolean); ;} break; case 81: -#line 530 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 533 "../css/CSSGrammar.y" { (yyval.boolean) = static_cast<CSSParser*>(parser)->addVariable((yyvsp[(1) - (4)].string), (yyvsp[(4) - (4)].valueList)); ;} break; case 82: -#line 534 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 537 "../css/CSSGrammar.y" { (yyval.boolean) = static_cast<CSSParser*>(parser)->addVariableDeclarationBlock((yyvsp[(1) - (7)].string)); ;} break; case 83: -#line 538 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 541 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 84: -#line 542 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 545 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 85: -#line 546 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 549 "../css/CSSGrammar.y" { /* @variables { varname: } Just reduce away this variable with no value. */ (yyval.boolean) = false; @@ -2503,7 +2549,9 @@ yyreduce: break; case 86: -#line 551 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 554 "../css/CSSGrammar.y" { /* if we come across rules with invalid values like this case: @variables { varname: *; }, just discard the property/value pair */ (yyval.boolean) = false; @@ -2511,14 +2559,18 @@ yyreduce: break; case 87: -#line 558 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 561 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 88: -#line 564 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 567 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); if (p->m_styleSheet) @@ -2527,38 +2579,50 @@ yyreduce: break; case 91: -#line 574 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 577 "../css/CSSGrammar.y" { (yyval.string).characters = 0; ;} break; case 92: -#line 575 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 578 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 95: -#line 584 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 587 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 96: -#line 590 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 593 "../css/CSSGrammar.y" { (yyval.valueList) = 0; ;} break; case 97: -#line 593 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 596 "../css/CSSGrammar.y" { (yyval.valueList) = (yyvsp[(3) - (4)].valueList); ;} break; case 98: -#line 599 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 602 "../css/CSSGrammar.y" { (yyvsp[(3) - (7)].string).lower(); (yyval.mediaQueryExp) = static_cast<CSSParser*>(parser)->createFloatingMediaQueryExp((yyvsp[(3) - (7)].string), (yyvsp[(5) - (7)].valueList)); @@ -2566,7 +2630,9 @@ yyreduce: break; case 99: -#line 606 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 609 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); (yyval.mediaQueryExpList) = p->createFloatingMediaQueryExpList(); @@ -2575,7 +2641,9 @@ yyreduce: break; case 100: -#line 611 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 614 "../css/CSSGrammar.y" { (yyval.mediaQueryExpList) = (yyvsp[(1) - (5)].mediaQueryExpList); (yyval.mediaQueryExpList)->append(static_cast<CSSParser*>(parser)->sinkFloatingMediaQueryExp((yyvsp[(5) - (5)].mediaQueryExp))); @@ -2583,42 +2651,54 @@ yyreduce: break; case 101: -#line 618 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 621 "../css/CSSGrammar.y" { (yyval.mediaQueryExpList) = static_cast<CSSParser*>(parser)->createFloatingMediaQueryExpList(); ;} break; case 102: -#line 621 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 624 "../css/CSSGrammar.y" { (yyval.mediaQueryExpList) = (yyvsp[(3) - (3)].mediaQueryExpList); ;} break; case 103: -#line 627 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 630 "../css/CSSGrammar.y" { (yyval.mediaQueryRestrictor) = MediaQuery::None; ;} break; case 104: -#line 630 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 633 "../css/CSSGrammar.y" { (yyval.mediaQueryRestrictor) = MediaQuery::Only; ;} break; case 105: -#line 633 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 636 "../css/CSSGrammar.y" { (yyval.mediaQueryRestrictor) = MediaQuery::Not; ;} break; case 106: -#line 639 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 642 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); (yyval.mediaQuery) = p->createFloatingMediaQuery(p->sinkFloatingMediaQueryExpList((yyvsp[(1) - (1)].mediaQueryExpList))); @@ -2626,7 +2706,9 @@ yyreduce: break; case 107: -#line 644 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 647 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); (yyvsp[(3) - (4)].string).lower(); @@ -2635,14 +2717,18 @@ yyreduce: break; case 108: -#line 652 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 655 "../css/CSSGrammar.y" { (yyval.mediaList) = static_cast<CSSParser*>(parser)->createMediaList(); ;} break; case 110: -#line 659 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 662 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); (yyval.mediaList) = p->createMediaList(); @@ -2651,7 +2737,9 @@ yyreduce: break; case 111: -#line 664 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 667 "../css/CSSGrammar.y" { (yyval.mediaList) = (yyvsp[(1) - (4)].mediaList); if ((yyval.mediaList)) @@ -2660,35 +2748,45 @@ yyreduce: break; case 112: -#line 669 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 672 "../css/CSSGrammar.y" { (yyval.mediaList) = 0; ;} break; case 113: -#line 675 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 678 "../css/CSSGrammar.y" { (yyval.rule) = static_cast<CSSParser*>(parser)->createMediaRule((yyvsp[(3) - (7)].mediaList), (yyvsp[(6) - (7)].ruleList)); ;} break; case 114: -#line 678 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 681 "../css/CSSGrammar.y" { (yyval.rule) = static_cast<CSSParser*>(parser)->createMediaRule(0, (yyvsp[(5) - (6)].ruleList)); ;} break; case 115: -#line 684 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 687 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 116: -#line 690 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 693 "../css/CSSGrammar.y" { (yyval.rule) = (yyvsp[(7) - (8)].keyframesRule); (yyvsp[(7) - (8)].keyframesRule)->setNameInternal((yyvsp[(3) - (8)].string)); @@ -2696,12 +2794,16 @@ yyreduce: break; case 119: -#line 702 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 705 "../css/CSSGrammar.y" { (yyval.keyframesRule) = static_cast<CSSParser*>(parser)->createKeyframesRule(); ;} break; case 120: -#line 703 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 706 "../css/CSSGrammar.y" { (yyval.keyframesRule) = (yyvsp[(1) - (3)].keyframesRule); if ((yyvsp[(2) - (3)].keyframeRule)) @@ -2710,14 +2812,18 @@ yyreduce: break; case 121: -#line 711 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 714 "../css/CSSGrammar.y" { (yyval.keyframeRule) = static_cast<CSSParser*>(parser)->createKeyframeRule((yyvsp[(1) - (6)].valueList)); ;} break; case 122: -#line 717 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 720 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); (yyval.valueList) = p->createFloatingValueList(); @@ -2726,7 +2832,9 @@ yyreduce: break; case 123: -#line 722 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 725 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); (yyval.valueList) = (yyvsp[(1) - (5)].valueList); @@ -2736,12 +2844,16 @@ yyreduce: break; case 124: -#line 731 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 734 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).fValue = (yyvsp[(1) - (1)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; ;} break; case 125: -#line 732 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 735 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; CSSParserString& str = (yyvsp[(1) - (1)].string); @@ -2755,74 +2867,98 @@ yyreduce: break; case 126: -#line 756 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 759 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 127: -#line 759 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 762 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 128: -#line 766 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 769 "../css/CSSGrammar.y" { (yyval.rule) = static_cast<CSSParser*>(parser)->createFontFaceRule(); ;} break; case 129: -#line 769 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 772 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 130: -#line 772 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 775 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 131: -#line 778 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 781 "../css/CSSGrammar.y" { (yyval.relation) = CSSSelector::DirectAdjacent; ;} break; case 132: -#line 779 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 782 "../css/CSSGrammar.y" { (yyval.relation) = CSSSelector::IndirectAdjacent; ;} break; case 133: -#line 780 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 783 "../css/CSSGrammar.y" { (yyval.relation) = CSSSelector::Child; ;} break; case 134: -#line 784 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 787 "../css/CSSGrammar.y" { (yyval.integer) = -1; ;} break; case 135: -#line 785 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 788 "../css/CSSGrammar.y" { (yyval.integer) = 1; ;} break; case 136: -#line 789 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 792 "../css/CSSGrammar.y" { (yyval.rule) = static_cast<CSSParser*>(parser)->createStyleRule((yyvsp[(1) - (5)].selectorList)); ;} break; case 137: -#line 795 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 798 "../css/CSSGrammar.y" { if ((yyvsp[(1) - (1)].selector)) { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2835,7 +2971,9 @@ yyreduce: break; case 138: -#line 804 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 807 "../css/CSSGrammar.y" { if ((yyvsp[(1) - (4)].selectorList) && (yyvsp[(4) - (4)].selector)) { CSSParser* p = static_cast<CSSParser*>(parser); @@ -2847,35 +2985,45 @@ yyreduce: break; case 139: -#line 812 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 815 "../css/CSSGrammar.y" { (yyval.selectorList) = 0; ;} break; case 140: -#line 818 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 821 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (2)].selector); ;} break; case 141: -#line 824 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 827 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); ;} break; case 142: -#line 828 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 831 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); ;} break; case 143: -#line 832 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 835 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(2) - (2)].selector); if (!(yyvsp[(1) - (2)].selector)) @@ -2894,7 +3042,9 @@ yyreduce: break; case 144: -#line 847 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 850 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(3) - (3)].selector); if (!(yyvsp[(1) - (3)].selector)) @@ -2918,29 +3068,39 @@ yyreduce: break; case 145: -#line 867 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 870 "../css/CSSGrammar.y" { (yyval.selector) = 0; ;} break; case 146: -#line 873 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 876 "../css/CSSGrammar.y" { (yyval.string).characters = 0; (yyval.string).length = 0; ;} break; case 147: -#line 874 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 877 "../css/CSSGrammar.y" { static UChar star = '*'; (yyval.string).characters = ☆ (yyval.string).length = 1; ;} break; case 148: -#line 875 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 878 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 149: -#line 879 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 882 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); (yyval.selector) = p->createFloatingSelector(); @@ -2949,7 +3109,9 @@ yyreduce: break; case 150: -#line 884 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 887 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(2) - (2)].selector); if ((yyval.selector)) { @@ -2960,7 +3122,9 @@ yyreduce: break; case 151: -#line 891 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 894 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); CSSParser* p = static_cast<CSSParser*>(parser); @@ -2970,7 +3134,9 @@ yyreduce: break; case 152: -#line 897 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 900 "../css/CSSGrammar.y" { AtomicString namespacePrefix = (yyvsp[(1) - (2)].string); CSSParser* p = static_cast<CSSParser*>(parser); @@ -2984,7 +3150,9 @@ yyreduce: break; case 153: -#line 907 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 910 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(3) - (3)].selector); if ((yyval.selector)) { @@ -3000,7 +3168,9 @@ yyreduce: break; case 154: -#line 919 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 922 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(2) - (2)].selector); if ((yyval.selector)) { @@ -3014,7 +3184,9 @@ yyreduce: break; case 155: -#line 932 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 935 "../css/CSSGrammar.y" { CSSParserString& str = (yyvsp[(1) - (1)].string); CSSParser* p = static_cast<CSSParser*>(parser); @@ -3026,7 +3198,9 @@ yyreduce: break; case 156: -#line 940 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 943 "../css/CSSGrammar.y" { static UChar star = '*'; (yyval.string).characters = ☆ @@ -3035,14 +3209,18 @@ yyreduce: break; case 157: -#line 948 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 951 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); ;} break; case 158: -#line 951 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 954 "../css/CSSGrammar.y" { if (!(yyvsp[(2) - (2)].selector)) (yyval.selector) = 0; @@ -3059,14 +3237,18 @@ yyreduce: break; case 159: -#line 964 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 967 "../css/CSSGrammar.y" { (yyval.selector) = 0; ;} break; case 160: -#line 970 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 973 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3078,7 +3260,9 @@ yyreduce: break; case 161: -#line 978 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 981 "../css/CSSGrammar.y" { if ((yyvsp[(1) - (1)].string).characters[0] >= '0' && (yyvsp[(1) - (1)].string).characters[0] <= '9') { (yyval.selector) = 0; @@ -3094,7 +3278,9 @@ yyreduce: break; case 165: -#line 996 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 999 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3106,7 +3292,9 @@ yyreduce: break; case 166: -#line 1007 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1010 "../css/CSSGrammar.y" { CSSParserString& str = (yyvsp[(1) - (2)].string); CSSParser* p = static_cast<CSSParser*>(parser); @@ -3118,7 +3306,9 @@ yyreduce: break; case 167: -#line 1018 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1021 "../css/CSSGrammar.y" { (yyval.selector) = static_cast<CSSParser*>(parser)->createFloatingSelector(); (yyval.selector)->setAttribute(QualifiedName(nullAtom, (yyvsp[(3) - (4)].string), nullAtom)); @@ -3127,7 +3317,9 @@ yyreduce: break; case 168: -#line 1023 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1026 "../css/CSSGrammar.y" { (yyval.selector) = static_cast<CSSParser*>(parser)->createFloatingSelector(); (yyval.selector)->setAttribute(QualifiedName(nullAtom, (yyvsp[(3) - (8)].string), nullAtom)); @@ -3137,7 +3329,9 @@ yyreduce: break; case 169: -#line 1029 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1032 "../css/CSSGrammar.y" { AtomicString namespacePrefix = (yyvsp[(3) - (5)].string); CSSParser* p = static_cast<CSSParser*>(parser); @@ -3149,7 +3343,9 @@ yyreduce: break; case 170: -#line 1037 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1040 "../css/CSSGrammar.y" { AtomicString namespacePrefix = (yyvsp[(3) - (9)].string); CSSParser* p = static_cast<CSSParser*>(parser); @@ -3162,49 +3358,63 @@ yyreduce: break; case 171: -#line 1049 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1052 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::Exact; ;} break; case 172: -#line 1052 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1055 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::List; ;} break; case 173: -#line 1055 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1058 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::Hyphen; ;} break; case 174: -#line 1058 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1061 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::Begin; ;} break; case 175: -#line 1061 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1064 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::End; ;} break; case 176: -#line 1064 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1067 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::Contain; ;} break; case 179: -#line 1075 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1078 "../css/CSSGrammar.y" { (yyval.selector) = static_cast<CSSParser*>(parser)->createFloatingSelector(); (yyval.selector)->m_match = CSSSelector::PseudoClass; @@ -3228,12 +3438,19 @@ yyreduce: CSSParser* p = static_cast<CSSParser*>(parser); if (Document* doc = p->document()) doc->setUsesFirstLineRules(true); + } else if (type == CSSSelector::PseudoBefore || + type == CSSSelector::PseudoAfter) { + CSSParser* p = static_cast<CSSParser*>(parser); + if (Document* doc = p->document()) + doc->setUsesBeforeAfterRules(true); } ;} break; case 180: -#line 1100 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1108 "../css/CSSGrammar.y" { (yyval.selector) = static_cast<CSSParser*>(parser)->createFloatingSelector(); (yyval.selector)->m_match = CSSSelector::PseudoElement; @@ -3246,12 +3463,19 @@ yyreduce: CSSParser* p = static_cast<CSSParser*>(parser); if (Document* doc = p->document()) doc->setUsesFirstLineRules(true); + } else if (type == CSSSelector::PseudoBefore || + type == CSSSelector::PseudoAfter) { + CSSParser* p = static_cast<CSSParser*>(parser); + if (Document* doc = p->document()) + doc->setUsesBeforeAfterRules(true); } ;} break; case 181: -#line 1115 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1128 "../css/CSSGrammar.y" { CSSParser *p = static_cast<CSSParser*>(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3272,7 +3496,9 @@ yyreduce: break; case 182: -#line 1133 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1146 "../css/CSSGrammar.y" { CSSParser *p = static_cast<CSSParser*>(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3293,7 +3519,9 @@ yyreduce: break; case 183: -#line 1151 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1164 "../css/CSSGrammar.y" { CSSParser *p = static_cast<CSSParser*>(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3315,9 +3543,11 @@ yyreduce: break; case 184: -#line 1170 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1183 "../css/CSSGrammar.y" { - if (!(yyvsp[(4) - (6)].selector)) + if (!(yyvsp[(4) - (6)].selector) || (yyvsp[(4) - (6)].selector)->simpleSelector() || (yyvsp[(4) - (6)].selector)->tagHistory()) (yyval.selector) = 0; else { CSSParser* p = static_cast<CSSParser*>(parser); @@ -3331,14 +3561,18 @@ yyreduce: break; case 185: -#line 1185 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1198 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (1)].boolean); ;} break; case 186: -#line 1188 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1201 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); if ( (yyvsp[(2) - (2)].boolean) ) @@ -3347,70 +3581,90 @@ yyreduce: break; case 187: -#line 1193 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1206 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (1)].boolean); ;} break; case 188: -#line 1196 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1209 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 189: -#line 1199 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1212 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 190: -#line 1202 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1215 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); ;} break; case 191: -#line 1205 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1218 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); ;} break; case 192: -#line 1211 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1224 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (3)].boolean); ;} break; case 193: -#line 1214 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1227 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 194: -#line 1217 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1230 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 195: -#line 1220 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1233 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 196: -#line 1223 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1236 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (4)].boolean); if ((yyvsp[(2) - (4)].boolean)) @@ -3419,21 +3673,27 @@ yyreduce: break; case 197: -#line 1228 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1241 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (4)].boolean); ;} break; case 198: -#line 1231 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1244 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (6)].boolean); ;} break; case 199: -#line 1237 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1250 "../css/CSSGrammar.y" { (yyval.boolean) = false; CSSParser* p = static_cast<CSSParser*>(parser); @@ -3450,7 +3710,9 @@ yyreduce: break; case 200: -#line 1251 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1264 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); p->m_valueList = new CSSParserValueList; @@ -3465,14 +3727,18 @@ yyreduce: break; case 201: -#line 1263 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1276 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 202: -#line 1267 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1280 "../css/CSSGrammar.y" { /* The default movable type template has letter-spacing: .none; Handle this by looking for error tokens at the start of an expr, recover the expr and then treat as an error, cleaning @@ -3482,7 +3748,9 @@ yyreduce: break; case 203: -#line 1274 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1287 "../css/CSSGrammar.y" { /* When we encounter something like p {color: red !important fail;} we should drop the declaration */ (yyval.boolean) = false; @@ -3490,7 +3758,9 @@ yyreduce: break; case 204: -#line 1279 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1292 "../css/CSSGrammar.y" { /* Handle this case: div { text-align: center; !important } Just reduce away the stray !important. */ (yyval.boolean) = false; @@ -3498,7 +3768,9 @@ yyreduce: break; case 205: -#line 1284 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1297 "../css/CSSGrammar.y" { /* div { font-family: } Just reduce away this property with no value. */ (yyval.boolean) = false; @@ -3506,7 +3778,9 @@ yyreduce: break; case 206: -#line 1289 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1302 "../css/CSSGrammar.y" { /* if we come across rules with invalid values like this case: p { weight: *; }, just discard the rule */ (yyval.boolean) = false; @@ -3514,7 +3788,9 @@ yyreduce: break; case 207: -#line 1294 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1307 "../css/CSSGrammar.y" { /* if we come across: div { color{;color:maroon} }, ignore everything within curly brackets */ (yyval.boolean) = false; @@ -3522,24 +3798,32 @@ yyreduce: break; case 208: -#line 1301 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1314 "../css/CSSGrammar.y" { (yyval.integer) = cssPropertyID((yyvsp[(1) - (2)].string)); ;} break; case 209: -#line 1307 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1320 "../css/CSSGrammar.y" { (yyval.boolean) = true; ;} break; case 210: -#line 1308 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1321 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 211: -#line 1312 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1325 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); (yyval.valueList) = p->createFloatingValueList(); @@ -3548,7 +3832,9 @@ yyreduce: break; case 212: -#line 1317 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1330 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); (yyval.valueList) = (yyvsp[(1) - (3)].valueList); @@ -3566,50 +3852,66 @@ yyreduce: break; case 213: -#line 1331 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1344 "../css/CSSGrammar.y" { (yyval.valueList) = 0; ;} break; case 214: -#line 1337 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1350 "../css/CSSGrammar.y" { (yyval.character) = '/'; ;} break; case 215: -#line 1340 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1353 "../css/CSSGrammar.y" { (yyval.character) = ','; ;} break; case 216: -#line 1343 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1356 "../css/CSSGrammar.y" { (yyval.character) = 0; ;} break; case 217: -#line 1349 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1362 "../css/CSSGrammar.y" { (yyval.value) = (yyvsp[(1) - (1)].value); ;} break; case 218: -#line 1350 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1363 "../css/CSSGrammar.y" { (yyval.value) = (yyvsp[(2) - (2)].value); (yyval.value).fValue *= (yyvsp[(1) - (2)].integer); ;} break; case 219: -#line 1351 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1364 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_STRING; ;} break; case 220: -#line 1352 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1365 "../css/CSSGrammar.y" { (yyval.value).id = cssValueKeywordID((yyvsp[(1) - (2)].string)); (yyval.value).unit = CSSPrimitiveValue::CSS_IDENT; @@ -3618,156 +3920,218 @@ yyreduce: break; case 221: -#line 1358 "../css/CSSGrammar.y" - { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION ;} + +/* Line 1455 of yacc.c */ +#line 1371 "../css/CSSGrammar.y" + { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION; ;} break; case 222: -#line 1359 "../css/CSSGrammar.y" - { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(2) - (3)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION ;} + +/* Line 1455 of yacc.c */ +#line 1372 "../css/CSSGrammar.y" + { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(2) - (3)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION; ;} break; case 223: -#line 1360 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1373 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_URI; ;} break; case 224: -#line 1361 "../css/CSSGrammar.y" - { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_UNICODE_RANGE ;} + +/* Line 1455 of yacc.c */ +#line 1374 "../css/CSSGrammar.y" + { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_UNICODE_RANGE; ;} break; case 225: -#line 1362 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1375 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (1)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; ;} break; case 226: -#line 1363 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1376 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = CSSParserString(); (yyval.value).unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; ;} break; case 227: -#line 1365 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1378 "../css/CSSGrammar.y" { (yyval.value) = (yyvsp[(1) - (1)].value); ;} break; case 228: -#line 1368 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1381 "../css/CSSGrammar.y" { (yyval.value) = (yyvsp[(1) - (2)].value); ;} break; case 229: -#line 1371 "../css/CSSGrammar.y" - {;} + +/* Line 1455 of yacc.c */ +#line 1384 "../css/CSSGrammar.y" + { /* Handle width: %; */ + (yyval.value).id = 0; (yyval.value).unit = 0; + ;} break; case 230: -#line 1375 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1390 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).isInt = true; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; ;} break; case 231: -#line 1376 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1391 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; ;} break; case 232: -#line 1377 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1392 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PERCENTAGE; ;} break; case 233: -#line 1378 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1393 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PX; ;} break; case 234: -#line 1379 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1394 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_CM; ;} break; case 235: -#line 1380 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1395 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_MM; ;} break; case 236: -#line 1381 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1396 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_IN; ;} break; case 237: -#line 1382 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1397 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PT; ;} break; case 238: -#line 1383 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1398 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PC; ;} break; case 239: -#line 1384 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1399 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_DEG; ;} break; case 240: -#line 1385 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1400 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_RAD; ;} break; case 241: -#line 1386 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1401 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_GRAD; ;} break; case 242: -#line 1387 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1402 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_TURN; ;} break; case 243: -#line 1388 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1403 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_MS; ;} break; case 244: -#line 1389 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1404 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_S; ;} break; case 245: -#line 1390 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1405 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_HZ; ;} break; case 246: -#line 1391 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1406 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_KHZ; ;} break; case 247: -#line 1392 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1407 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_EMS; ;} break; case 248: -#line 1393 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1408 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSParserValue::Q_EMS; ;} break; case 249: -#line 1394 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1409 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_EXS; ;} break; case 250: -#line 1398 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1413 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (1)].string); @@ -3776,7 +4140,9 @@ yyreduce: break; case 251: -#line 1406 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1421 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); CSSParserFunction* f = p->createFloatingFunction(); @@ -3789,7 +4155,9 @@ yyreduce: break; case 252: -#line 1415 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1430 "../css/CSSGrammar.y" { CSSParser* p = static_cast<CSSParser*>(parser); CSSParserFunction* f = p->createFloatingFunction(); @@ -3802,67 +4170,86 @@ yyreduce: break; case 253: -#line 1431 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1446 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 254: -#line 1432 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1447 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 255: -#line 1439 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1454 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 256: -#line 1442 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1457 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 257: -#line 1448 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1463 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 258: -#line 1451 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1466 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 261: -#line 1462 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1477 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 262: -#line 1468 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1483 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 263: -#line 1474 "../css/CSSGrammar.y" + +/* Line 1455 of yacc.c */ +#line 1489 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; -/* Line 1267 of yacc.c. */ -#line 3866 "WebCore/tmp/../generated/CSSGrammar.tab.c" + +/* Line 1455 of yacc.c */ +#line 4253 "WebCore/tmp/../generated/CSSGrammar.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3873,7 +4260,6 @@ yyreduce: *++yyvsp = yyval; - /* Now `shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -3938,7 +4324,7 @@ yyerrlab: if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an + /* If just tried and failed to reuse lookahead token after an error, discard it. */ if (yychar <= YYEOF) @@ -3955,7 +4341,7 @@ yyerrlab: } } - /* Else will try to reuse look-ahead token after shifting the error + /* Else will try to reuse lookahead token after shifting the error token. */ goto yyerrlab1; @@ -4012,9 +4398,6 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - *++yyvsp = yylval; @@ -4039,7 +4422,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#ifndef yyoverflow +#if !defined(yyoverflow) || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -4050,7 +4433,7 @@ yyexhaustedlab: #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) + if (yychar != YYEMPTY) yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval); /* Do not reclaim the symbols of the rule which action triggered @@ -4076,6 +4459,8 @@ yyreturn: } -#line 1501 "../css/CSSGrammar.y" + +/* Line 1675 of yacc.c */ +#line 1516 "../css/CSSGrammar.y" diff --git a/src/3rdparty/webkit/WebCore/generated/CSSGrammar.h b/src/3rdparty/webkit/WebCore/generated/CSSGrammar.h index 1b60c68199..4223680d50 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSGrammar.h +++ b/src/3rdparty/webkit/WebCore/generated/CSSGrammar.h @@ -1,26 +1,25 @@ #ifndef CSSGRAMMAR_H #define CSSGRAMMAR_H -/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton interface for Bison's Yacc-like parsers in C +/* A Bison parser, made by GNU Bison 2.4.1. */ - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +/* Skeleton interface for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -31,10 +30,11 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ + /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -42,140 +42,80 @@ know about them. */ enum yytokentype { TOKEN_EOF = 0, - UNIMPORTANT_TOK = 258, - WHITESPACE = 259, - SGML_CD = 260, - INCLUDES = 261, - DASHMATCH = 262, - BEGINSWITH = 263, - ENDSWITH = 264, - CONTAINS = 265, - STRING = 266, - IDENT = 267, - NTH = 268, - HEX = 269, - IDSEL = 270, - IMPORT_SYM = 271, - PAGE_SYM = 272, - MEDIA_SYM = 273, - FONT_FACE_SYM = 274, - CHARSET_SYM = 275, - NAMESPACE_SYM = 276, - WEBKIT_RULE_SYM = 277, - WEBKIT_DECLS_SYM = 278, - WEBKIT_KEYFRAME_RULE_SYM = 279, - WEBKIT_KEYFRAMES_SYM = 280, - WEBKIT_VALUE_SYM = 281, - WEBKIT_MEDIAQUERY_SYM = 282, - WEBKIT_SELECTOR_SYM = 283, - WEBKIT_VARIABLES_SYM = 284, - WEBKIT_DEFINE_SYM = 285, - VARIABLES_FOR = 286, - WEBKIT_VARIABLES_DECLS_SYM = 287, - ATKEYWORD = 288, - IMPORTANT_SYM = 289, - MEDIA_ONLY = 290, - MEDIA_NOT = 291, - MEDIA_AND = 292, - QEMS = 293, - EMS = 294, - EXS = 295, - PXS = 296, - CMS = 297, - MMS = 298, - INS = 299, - PTS = 300, - PCS = 301, - DEGS = 302, - RADS = 303, - GRADS = 304, - TURNS = 305, - MSECS = 306, - SECS = 307, - HERZ = 308, - KHERZ = 309, - DIMEN = 310, - PERCENTAGE = 311, - FLOATTOKEN = 312, - INTEGER = 313, - URI = 314, - FUNCTION = 315, - NOTFUNCTION = 316, - UNICODERANGE = 317, - VARCALL = 318 + LOWEST_PREC = 258, + UNIMPORTANT_TOK = 259, + WHITESPACE = 260, + SGML_CD = 261, + INCLUDES = 262, + DASHMATCH = 263, + BEGINSWITH = 264, + ENDSWITH = 265, + CONTAINS = 266, + STRING = 267, + IDENT = 268, + NTH = 269, + HEX = 270, + IDSEL = 271, + IMPORT_SYM = 272, + PAGE_SYM = 273, + MEDIA_SYM = 274, + FONT_FACE_SYM = 275, + CHARSET_SYM = 276, + NAMESPACE_SYM = 277, + WEBKIT_RULE_SYM = 278, + WEBKIT_DECLS_SYM = 279, + WEBKIT_KEYFRAME_RULE_SYM = 280, + WEBKIT_KEYFRAMES_SYM = 281, + WEBKIT_VALUE_SYM = 282, + WEBKIT_MEDIAQUERY_SYM = 283, + WEBKIT_SELECTOR_SYM = 284, + WEBKIT_VARIABLES_SYM = 285, + WEBKIT_DEFINE_SYM = 286, + VARIABLES_FOR = 287, + WEBKIT_VARIABLES_DECLS_SYM = 288, + ATKEYWORD = 289, + IMPORTANT_SYM = 290, + MEDIA_ONLY = 291, + MEDIA_NOT = 292, + MEDIA_AND = 293, + QEMS = 294, + EMS = 295, + EXS = 296, + PXS = 297, + CMS = 298, + MMS = 299, + INS = 300, + PTS = 301, + PCS = 302, + DEGS = 303, + RADS = 304, + GRADS = 305, + TURNS = 306, + MSECS = 307, + SECS = 308, + HERZ = 309, + KHERZ = 310, + DIMEN = 311, + PERCENTAGE = 312, + FLOATTOKEN = 313, + INTEGER = 314, + URI = 315, + FUNCTION = 316, + NOTFUNCTION = 317, + UNICODERANGE = 318, + VARCALL = 319 }; #endif -/* Tokens. */ -#define TOKEN_EOF 0 -#define UNIMPORTANT_TOK 258 -#define WHITESPACE 259 -#define SGML_CD 260 -#define INCLUDES 261 -#define DASHMATCH 262 -#define BEGINSWITH 263 -#define ENDSWITH 264 -#define CONTAINS 265 -#define STRING 266 -#define IDENT 267 -#define NTH 268 -#define HEX 269 -#define IDSEL 270 -#define IMPORT_SYM 271 -#define PAGE_SYM 272 -#define MEDIA_SYM 273 -#define FONT_FACE_SYM 274 -#define CHARSET_SYM 275 -#define NAMESPACE_SYM 276 -#define WEBKIT_RULE_SYM 277 -#define WEBKIT_DECLS_SYM 278 -#define WEBKIT_KEYFRAME_RULE_SYM 279 -#define WEBKIT_KEYFRAMES_SYM 280 -#define WEBKIT_VALUE_SYM 281 -#define WEBKIT_MEDIAQUERY_SYM 282 -#define WEBKIT_SELECTOR_SYM 283 -#define WEBKIT_VARIABLES_SYM 284 -#define WEBKIT_DEFINE_SYM 285 -#define VARIABLES_FOR 286 -#define WEBKIT_VARIABLES_DECLS_SYM 287 -#define ATKEYWORD 288 -#define IMPORTANT_SYM 289 -#define MEDIA_ONLY 290 -#define MEDIA_NOT 291 -#define MEDIA_AND 292 -#define QEMS 293 -#define EMS 294 -#define EXS 295 -#define PXS 296 -#define CMS 297 -#define MMS 298 -#define INS 299 -#define PTS 300 -#define PCS 301 -#define DEGS 302 -#define RADS 303 -#define GRADS 304 -#define TURNS 305 -#define MSECS 306 -#define SECS 307 -#define HERZ 308 -#define KHERZ 309 -#define DIMEN 310 -#define PERCENTAGE 311 -#define FLOATTOKEN 312 -#define INTEGER 313 -#define URI 314 -#define FUNCTION 315 -#define NOTFUNCTION 316 -#define UNICODERANGE 317 -#define VARCALL 318 - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 57 "../css/CSSGrammar.y" { + +/* Line 1676 of yacc.c */ +#line 58 "../css/CSSGrammar.y" + bool boolean; char character; int integer; @@ -197,15 +137,18 @@ typedef union YYSTYPE WebKitCSSKeyframeRule* keyframeRule; WebKitCSSKeyframesRule* keyframesRule; float val; -} -/* Line 1489 of yacc.c. */ -#line 201 "WebCore/tmp/../generated/CSSGrammar.tab.h" - YYSTYPE; + + + +/* Line 1676 of yacc.c */ +#line 143 "WebCore/tmp/../generated/CSSGrammar.tab.h" +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif + #endif diff --git a/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.cpp b/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.cpp index 25313ac1dc..dc000542b4 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.cpp +++ b/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.cpp @@ -37,7 +37,7 @@ struct props { const char* name; int id; }; -/* maximum key range = 1766, duplicates = 0 */ +/* maximum key range = 1603, duplicates = 0 */ #ifdef __GNUC__ __inline @@ -51,32 +51,32 @@ hash_prop (register const char *str, register unsigned int len) { static const unsigned short asso_values[] = { - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 0, 1769, 1769, 1769, 1769, - 1769, 0, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 5, 20, 0, - 10, 0, 325, 135, 210, 5, 0, 0, 0, 30, - 10, 0, 0, 30, 0, 10, 0, 185, 170, 40, - 355, 625, 45, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, 1769, - 1769, 1769, 1769, 1769, 1769, 1769 + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 0, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 5, 0, 75, + 0, 0, 325, 5, 295, 0, 0, 0, 105, 0, + 5, 0, 55, 20, 5, 25, 0, 50, 55, 15, + 400, 295, 145, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, + 1609, 1609, 1609, 1609, 1609, 1609 }; register int hval = len; @@ -226,664 +226,676 @@ findProp (register const char *str, register unsigned int len) { enum { - TOTAL_KEYWORDS = 270, + TOTAL_KEYWORDS = 269, MIN_WORD_LENGTH = 3, MAX_WORD_LENGTH = 43, - MIN_HASH_VALUE = 3, - MAX_HASH_VALUE = 1768 + MIN_HASH_VALUE = 6, + MAX_HASH_VALUE = 1608 }; static const struct props wordlist_prop[] = { -#line 132 "CSSPropertyNames.gperf" - {"top", CSSPropertyTop}, -#line 44 "CSSPropertyNames.gperf" - {"color", CSSPropertyColor}, -#line 43 "CSSPropertyNames.gperf" - {"clip", CSSPropertyClip}, -#line 42 "CSSPropertyNames.gperf" - {"clear", CSSPropertyClear}, -#line 109 "CSSPropertyNames.gperf" - {"src", CSSPropertySrc}, -#line 263 "CSSPropertyNames.gperf" - {"stroke", CSSPropertyStroke}, -#line 248 "CSSPropertyNames.gperf" - {"stop-color", CSSPropertyStopColor}, -#line 45 "CSSPropertyNames.gperf" - {"content", CSSPropertyContent}, +#line 40 "CSSPropertyNames.gperf" + {"bottom", CSSPropertyBottom}, #line 18 "CSSPropertyNames.gperf" {"border", CSSPropertyBorder}, -#line 97 "CSSPropertyNames.gperf" - {"position", CSSPropertyPosition}, -#line 49 "CSSPropertyNames.gperf" - {"direction", CSSPropertyDirection}, -#line 35 "CSSPropertyNames.gperf" - {"border-top", CSSPropertyBorderTop}, -#line 258 "CSSPropertyNames.gperf" +#line 257 "CSSPropertyNames.gperf" {"marker", CSSPropertyMarker}, -#line 24 "CSSPropertyNames.gperf" - {"border-color", CSSPropertyBorderColor}, -#line 266 "CSSPropertyNames.gperf" - {"stroke-linecap", CSSPropertyStrokeLinecap}, -#line 36 "CSSPropertyNames.gperf" - {"border-top-color", CSSPropertyBorderTopColor}, -#line 242 "CSSPropertyNames.gperf" - {"mask", CSSPropertyMask}, -#line 250 "CSSPropertyNames.gperf" - {"color-interpolation", CSSPropertyColorInterpolation}, -#line 267 "CSSPropertyNames.gperf" - {"stroke-linejoin", CSSPropertyStrokeLinejoin}, -#line 40 "CSSPropertyNames.gperf" - {"bottom", CSSPropertyBottom}, -#line 41 "CSSPropertyNames.gperf" - {"caption-side", CSSPropertyCaptionSide}, -#line 23 "CSSPropertyNames.gperf" - {"border-collapse", CSSPropertyBorderCollapse}, -#line 107 "CSSPropertyNames.gperf" - {"scrollbar-track-color", CSSPropertyScrollbarTrackColor}, -#line 261 "CSSPropertyNames.gperf" - {"marker-start", CSSPropertyMarkerStart}, -#line 108 "CSSPropertyNames.gperf" - {"size", CSSPropertySize}, +#line 19 "CSSPropertyNames.gperf" + {"border-bottom", CSSPropertyBorderBottom}, #line 259 "CSSPropertyNames.gperf" + {"marker-mid", CSSPropertyMarkerMid}, +#line 68 "CSSPropertyNames.gperf" + {"margin", CSSPropertyMargin}, +#line 276 "CSSPropertyNames.gperf" + {"kerning", CSSPropertyKerning}, +#line 258 "CSSPropertyNames.gperf" {"marker-end", CSSPropertyMarkerEnd}, -#line 99 "CSSPropertyNames.gperf" - {"resize", CSSPropertyResize}, -#line 144 "CSSPropertyNames.gperf" - {"zoom", CSSPropertyZoom}, -#line 140 "CSSPropertyNames.gperf" +#line 69 "CSSPropertyNames.gperf" + {"margin-bottom", CSSPropertyMarginBottom}, +#line 241 "CSSPropertyNames.gperf" + {"mask", CSSPropertyMask}, +#line 262 "CSSPropertyNames.gperf" + {"stroke", CSSPropertyStroke}, +#line 133 "CSSPropertyNames.gperf" {"word-break", CSSPropertyWordBreak}, -#line 260 "CSSPropertyNames.gperf" - {"marker-mid", CSSPropertyMarkerMid}, -#line 19 "CSSPropertyNames.gperf" - {"border-bottom", CSSPropertyBorderBottom}, -#line 20 "CSSPropertyNames.gperf" - {"border-bottom-color", CSSPropertyBorderBottomColor}, -#line 102 "CSSPropertyNames.gperf" - {"scrollbar-arrow-color", CSSPropertyScrollbarArrowColor}, -#line 268 "CSSPropertyNames.gperf" - {"stroke-miterlimit", CSSPropertyStrokeMiterlimit}, -#line 142 "CSSPropertyNames.gperf" - {"word-wrap", CSSPropertyWordWrap}, -#line 153 "CSSPropertyNames.gperf" - {"-webkit-appearance", CSSPropertyWebkitAppearance}, +#line 278 "CSSPropertyNames.gperf" + {"writing-mode", CSSPropertyWritingMode}, +#line 151 "CSSPropertyNames.gperf" + {"-webkit-binding", CSSPropertyWebkitBinding}, +#line 256 "CSSPropertyNames.gperf" + {"image-rendering", CSSPropertyImageRendering}, #line 138 "CSSPropertyNames.gperf" - {"widows", CSSPropertyWidows}, -#line 204 "CSSPropertyNames.gperf" + {"-webkit-animation", CSSPropertyWebkitAnimation}, +#line 156 "CSSPropertyNames.gperf" + {"-webkit-border-image", CSSPropertyWebkitBorderImage}, +#line 197 "CSSPropertyNames.gperf" {"-webkit-mask", CSSPropertyWebkitMask}, -#line 192 "CSSPropertyNames.gperf" - {"-webkit-line-break", CSSPropertyWebkitLineBreak}, -#line 231 "CSSPropertyNames.gperf" - {"-webkit-transition", CSSPropertyWebkitTransition}, -#line 207 "CSSPropertyNames.gperf" - {"-webkit-mask-clip", CSSPropertyWebkitMaskClip}, -#line 193 "CSSPropertyNames.gperf" - {"-webkit-line-clamp", CSSPropertyWebkitLineClamp}, -#line 214 "CSSPropertyNames.gperf" - {"-webkit-mask-repeat", CSSPropertyWebkitMaskRepeat}, -#line 274 "CSSPropertyNames.gperf" - {"dominant-baseline", CSSPropertyDominantBaseline}, +#line 125 "CSSPropertyNames.gperf" + {"top", CSSPropertyTop}, +#line 131 "CSSPropertyNames.gperf" + {"widows", CSSPropertyWidows}, +#line 260 "CSSPropertyNames.gperf" + {"marker-start", CSSPropertyMarkerStart}, +#line 143 "CSSPropertyNames.gperf" + {"-webkit-animation-name", CSSPropertyWebkitAnimationName}, #line 92 "CSSPropertyNames.gperf" {"page", CSSPropertyPage}, -#line 145 "CSSPropertyNames.gperf" - {"-webkit-animation", CSSPropertyWebkitAnimation}, -#line 211 "CSSPropertyNames.gperf" - {"-webkit-mask-position", CSSPropertyWebkitMaskPosition}, -#line 217 "CSSPropertyNames.gperf" - {"-webkit-nbsp-mode", CSSPropertyWebkitNbspMode}, -#line 277 "CSSPropertyNames.gperf" - {"kerning", CSSPropertyKerning}, -#line 208 "CSSPropertyNames.gperf" - {"-webkit-mask-composite", CSSPropertyWebkitMaskComposite}, -#line 62 "CSSPropertyNames.gperf" - {"letter-spacing", CSSPropertyLetterSpacing}, +#line 202 "CSSPropertyNames.gperf" + {"-webkit-mask-image", CSSPropertyWebkitMaskImage}, +#line 35 "CSSPropertyNames.gperf" + {"border-top", CSSPropertyBorderTop}, #line 87 "CSSPropertyNames.gperf" {"padding", CSSPropertyPadding}, -#line 253 "CSSPropertyNames.gperf" - {"color-rendering", CSSPropertyColorRendering}, +#line 230 "CSSPropertyNames.gperf" + {"-webkit-transition", CSSPropertyWebkitTransition}, +#line 203 "CSSPropertyNames.gperf" + {"-webkit-mask-origin", CSSPropertyWebkitMaskOrigin}, +#line 88 "CSSPropertyNames.gperf" + {"padding-bottom", CSSPropertyPaddingBottom}, +#line 72 "CSSPropertyNames.gperf" + {"margin-top", CSSPropertyMarginTop}, +#line 189 "CSSPropertyNames.gperf" + {"-webkit-margin-start", CSSPropertyWebkitMarginStart}, +#line 45 "CSSPropertyNames.gperf" + {"content", CSSPropertyContent}, +#line 97 "CSSPropertyNames.gperf" + {"position", CSSPropertyPosition}, +#line 49 "CSSPropertyNames.gperf" + {"direction", CSSPropertyDirection}, +#line 98 "CSSPropertyNames.gperf" + {"quotes", CSSPropertyQuotes}, +#line 102 "CSSPropertyNames.gperf" + {"src", CSSPropertySrc}, +#line 135 "CSSPropertyNames.gperf" + {"word-wrap", CSSPropertyWordWrap}, +#line 191 "CSSPropertyNames.gperf" + {"-webkit-marquee", CSSPropertyWebkitMarquee}, +#line 210 "CSSPropertyNames.gperf" + {"-webkit-nbsp-mode", CSSPropertyWebkitNbspMode}, +#line 95 "CSSPropertyNames.gperf" + {"page-break-inside", CSSPropertyPageBreakInside}, +#line 141 "CSSPropertyNames.gperf" + {"-webkit-animation-duration", CSSPropertyWebkitAnimationDuration}, +#line 235 "CSSPropertyNames.gperf" + {"-webkit-user-drag", CSSPropertyWebkitUserDrag}, +#line 207 "CSSPropertyNames.gperf" + {"-webkit-mask-repeat", CSSPropertyWebkitMaskRepeat}, +#line 157 "CSSPropertyNames.gperf" + {"-webkit-border-radius", CSSPropertyWebkitBorderRadius}, #line 91 "CSSPropertyNames.gperf" {"padding-top", CSSPropertyPaddingTop}, -#line 215 "CSSPropertyNames.gperf" - {"-webkit-mask-size", CSSPropertyWebkitMaskSize}, -#line 68 "CSSPropertyNames.gperf" - {"margin", CSSPropertyMargin}, -#line 147 "CSSPropertyNames.gperf" +#line 211 "CSSPropertyNames.gperf" + {"-webkit-padding-start", CSSPropertyWebkitPaddingStart}, +#line 126 "CSSPropertyNames.gperf" + {"unicode-bidi", CSSPropertyUnicodeBidi}, +#line 140 "CSSPropertyNames.gperf" {"-webkit-animation-direction", CSSPropertyWebkitAnimationDirection}, -#line 72 "CSSPropertyNames.gperf" - {"margin-top", CSSPropertyMarginTop}, -#line 241 "CSSPropertyNames.gperf" - {"clip-rule", CSSPropertyClipRule}, +#line 137 "CSSPropertyNames.gperf" + {"zoom", CSSPropertyZoom}, +#line 204 "CSSPropertyNames.gperf" + {"-webkit-mask-position", CSSPropertyWebkitMaskPosition}, +#line 232 "CSSPropertyNames.gperf" + {"-webkit-transition-duration", CSSPropertyWebkitTransitionDuration}, +#line 185 "CSSPropertyNames.gperf" + {"-webkit-line-break", CSSPropertyWebkitLineBreak}, +#line 10 "CSSPropertyNames.gperf" + {"background", CSSPropertyBackground}, +#line 267 "CSSPropertyNames.gperf" + {"stroke-miterlimit", CSSPropertyStrokeMiterlimit}, +#line 266 "CSSPropertyNames.gperf" + {"stroke-linejoin", CSSPropertyStrokeLinejoin}, +#line 127 "CSSPropertyNames.gperf" + {"unicode-range", CSSPropertyUnicodeRange}, +#line 96 "CSSPropertyNames.gperf" + {"pointer-events", CSSPropertyPointerEvents}, +#line 216 "CSSPropertyNames.gperf" + {"-webkit-rtl-ordering", CSSPropertyWebkitRtlOrdering}, #line 48 "CSSPropertyNames.gperf" {"cursor", CSSPropertyCursor}, -#line 150 "CSSPropertyNames.gperf" - {"-webkit-animation-name", CSSPropertyWebkitAnimationName}, #line 79 "CSSPropertyNames.gperf" {"outline", CSSPropertyOutline}, -#line 33 "CSSPropertyNames.gperf" - {"border-spacing", CSSPropertyBorderSpacing}, -#line 80 "CSSPropertyNames.gperf" - {"outline-color", CSSPropertyOutlineColor}, +#line 13 "CSSPropertyNames.gperf" + {"background-image", CSSPropertyBackgroundImage}, +#line 273 "CSSPropertyNames.gperf" + {"dominant-baseline", CSSPropertyDominantBaseline}, +#line 101 "CSSPropertyNames.gperf" + {"size", CSSPropertySize}, +#line 41 "CSSPropertyNames.gperf" + {"caption-side", CSSPropertyCaptionSide}, #line 47 "CSSPropertyNames.gperf" {"counter-reset", CSSPropertyCounterReset}, -#line 96 "CSSPropertyNames.gperf" - {"pointer-events", CSSPropertyPointerEvents}, -#line 95 "CSSPropertyNames.gperf" - {"page-break-inside", CSSPropertyPageBreakInside}, -#line 141 "CSSPropertyNames.gperf" +#line 99 "CSSPropertyNames.gperf" + {"resize", CSSPropertyResize}, +#line 194 "CSSPropertyNames.gperf" + {"-webkit-marquee-repetition", CSSPropertyWebkitMarqueeRepetition}, +#line 44 "CSSPropertyNames.gperf" + {"color", CSSPropertyColor}, +#line 33 "CSSPropertyNames.gperf" + {"border-spacing", CSSPropertyBorderSpacing}, +#line 42 "CSSPropertyNames.gperf" + {"clear", CSSPropertyClear}, +#line 195 "CSSPropertyNames.gperf" + {"-webkit-marquee-speed", CSSPropertyWebkitMarqueeSpeed}, +#line 149 "CSSPropertyNames.gperf" + {"-webkit-background-origin", CSSPropertyWebkitBackgroundOrigin}, +#line 134 "CSSPropertyNames.gperf" {"word-spacing", CSSPropertyWordSpacing}, -#line 240 "CSSPropertyNames.gperf" - {"clip-path", CSSPropertyClipPath}, -#line 98 "CSSPropertyNames.gperf" - {"quotes", CSSPropertyQuotes}, -#line 88 "CSSPropertyNames.gperf" - {"padding-bottom", CSSPropertyPaddingBottom}, -#line 78 "CSSPropertyNames.gperf" - {"orphans", CSSPropertyOrphans}, -#line 219 "CSSPropertyNames.gperf" - {"-webkit-rtl-ordering", CSSPropertyWebkitRtlOrdering}, -#line 279 "CSSPropertyNames.gperf" - {"writing-mode", CSSPropertyWritingMode}, -#line 69 "CSSPropertyNames.gperf" - {"margin-bottom", CSSPropertyMarginBottom}, -#line 133 "CSSPropertyNames.gperf" - {"unicode-bidi", CSSPropertyUnicodeBidi}, -#line 272 "CSSPropertyNames.gperf" - {"alignment-baseline", CSSPropertyAlignmentBaseline}, +#line 192 "CSSPropertyNames.gperf" + {"-webkit-marquee-direction", CSSPropertyWebkitMarqueeDirection}, +#line 24 "CSSPropertyNames.gperf" + {"border-color", CSSPropertyBorderColor}, +#line 193 "CSSPropertyNames.gperf" + {"-webkit-marquee-increment", CSSPropertyWebkitMarqueeIncrement}, +#line 142 "CSSPropertyNames.gperf" + {"-webkit-animation-iteration-count", CSSPropertyWebkitAnimationIterationCount}, +#line 20 "CSSPropertyNames.gperf" + {"border-bottom-color", CSSPropertyBorderBottomColor}, +#line 201 "CSSPropertyNames.gperf" + {"-webkit-mask-composite", CSSPropertyWebkitMaskComposite}, +#line 252 "CSSPropertyNames.gperf" + {"color-rendering", CSSPropertyColorRendering}, +#line 17 "CSSPropertyNames.gperf" + {"background-repeat", CSSPropertyBackgroundRepeat}, +#line 208 "CSSPropertyNames.gperf" + {"-webkit-mask-size", CSSPropertyWebkitMaskSize}, +#line 43 "CSSPropertyNames.gperf" + {"clip", CSSPropertyClip}, #line 46 "CSSPropertyNames.gperf" {"counter-increment", CSSPropertyCounterIncrement}, -#line 139 "CSSPropertyNames.gperf" +#line 145 "CSSPropertyNames.gperf" + {"-webkit-appearance", CSSPropertyWebkitAppearance}, +#line 14 "CSSPropertyNames.gperf" + {"background-position", CSSPropertyBackgroundPosition}, +#line 36 "CSSPropertyNames.gperf" + {"border-top-color", CSSPropertyBorderTopColor}, +#line 247 "CSSPropertyNames.gperf" + {"stop-color", CSSPropertyStopColor}, +#line 242 "CSSPropertyNames.gperf" + {"enable-background", CSSPropertyEnableBackground}, +#line 271 "CSSPropertyNames.gperf" + {"alignment-baseline", CSSPropertyAlignmentBaseline}, +#line 265 "CSSPropertyNames.gperf" + {"stroke-linecap", CSSPropertyStrokeLinecap}, +#line 182 "CSSPropertyNames.gperf" + {"-webkit-columns", CSSPropertyWebkitColumns}, +#line 62 "CSSPropertyNames.gperf" + {"letter-spacing", CSSPropertyLetterSpacing}, +#line 200 "CSSPropertyNames.gperf" + {"-webkit-mask-clip", CSSPropertyWebkitMaskClip}, +#line 212 "CSSPropertyNames.gperf" + {"-webkit-perspective", CSSPropertyWebkitPerspective}, +#line 100 "CSSPropertyNames.gperf" + {"right", CSSPropertyRight}, +#line 132 "CSSPropertyNames.gperf" {"width", CSSPropertyWidth}, -#line 158 "CSSPropertyNames.gperf" - {"-webkit-binding", CSSPropertyWebkitBinding}, -#line 218 "CSSPropertyNames.gperf" - {"-webkit-padding-start", CSSPropertyWebkitPaddingStart}, -#line 137 "CSSPropertyNames.gperf" - {"white-space", CSSPropertyWhiteSpace}, -#line 210 "CSSPropertyNames.gperf" - {"-webkit-mask-origin", CSSPropertyWebkitMaskOrigin}, -#line 196 "CSSPropertyNames.gperf" - {"-webkit-margin-start", CSSPropertyWebkitMarginStart}, -#line 270 "CSSPropertyNames.gperf" - {"stroke-width", CSSPropertyStrokeWidth}, -#line 195 "CSSPropertyNames.gperf" - {"-webkit-margin-collapse", CSSPropertyWebkitMarginCollapse}, -#line 238 "CSSPropertyNames.gperf" +#line 174 "CSSPropertyNames.gperf" + {"-webkit-column-break-inside", CSSPropertyWebkitColumnBreakInside}, +#line 237 "CSSPropertyNames.gperf" {"-webkit-user-select", CSSPropertyWebkitUserSelect}, -#line 163 "CSSPropertyNames.gperf" - {"-webkit-border-image", CSSPropertyWebkitBorderImage}, -#line 197 "CSSPropertyNames.gperf" - {"-webkit-margin-top-collapse", CSSPropertyWebkitMarginTopCollapse}, -#line 209 "CSSPropertyNames.gperf" - {"-webkit-mask-image", CSSPropertyWebkitMaskImage}, -#line 39 "CSSPropertyNames.gperf" - {"border-width", CSSPropertyBorderWidth}, -#line 38 "CSSPropertyNames.gperf" - {"border-top-width", CSSPropertyBorderTopWidth}, -#line 189 "CSSPropertyNames.gperf" - {"-webkit-columns", CSSPropertyWebkitColumns}, #line 76 "CSSPropertyNames.gperf" {"min-width", CSSPropertyMinWidth}, -#line 61 "CSSPropertyNames.gperf" - {"left", CSSPropertyLeft}, -#line 198 "CSSPropertyNames.gperf" - {"-webkit-marquee", CSSPropertyWebkitMarquee}, -#line 164 "CSSPropertyNames.gperf" - {"-webkit-border-radius", CSSPropertyWebkitBorderRadius}, -#line 106 "CSSPropertyNames.gperf" - {"scrollbar-shadow-color", CSSPropertyScrollbarShadowColor}, -#line 254 "CSSPropertyNames.gperf" - {"fill", CSSPropertyFill}, -#line 52 "CSSPropertyNames.gperf" - {"float", CSSPropertyFloat}, -#line 244 "CSSPropertyNames.gperf" - {"filter", CSSPropertyFilter}, +#line 213 "CSSPropertyNames.gperf" + {"-webkit-perspective-origin", CSSPropertyWebkitPerspectiveOrigin}, +#line 29 "CSSPropertyNames.gperf" + {"border-right", CSSPropertyBorderRight}, +#line 39 "CSSPropertyNames.gperf" + {"border-width", CSSPropertyBorderWidth}, +#line 176 "CSSPropertyNames.gperf" + {"-webkit-column-gap", CSSPropertyWebkitColumnGap}, #line 53 "CSSPropertyNames.gperf" {"font", CSSPropertyFont}, -#line 252 "CSSPropertyNames.gperf" - {"color-profile", CSSPropertyColorProfile}, -#line 194 "CSSPropertyNames.gperf" - {"-webkit-margin-bottom-collapse", CSSPropertyWebkitMarginBottomCollapse}, -#line 245 "CSSPropertyNames.gperf" - {"flood-color", CSSPropertyFloodColor}, -#line 135 "CSSPropertyNames.gperf" - {"vertical-align", CSSPropertyVerticalAlign}, -#line 103 "CSSPropertyNames.gperf" - {"scrollbar-darkshadow-color", CSSPropertyScrollbarDarkshadowColor}, -#line 233 "CSSPropertyNames.gperf" - {"-webkit-transition-duration", CSSPropertyWebkitTransitionDuration}, -#line 100 "CSSPropertyNames.gperf" - {"right", CSSPropertyRight}, -#line 202 "CSSPropertyNames.gperf" - {"-webkit-marquee-speed", CSSPropertyWebkitMarqueeSpeed}, -#line 239 "CSSPropertyNames.gperf" - {"-webkit-variable-declaration-block", CSSPropertyWebkitVariableDeclarationBlock}, -#line 257 "CSSPropertyNames.gperf" - {"image-rendering", CSSPropertyImageRendering}, -#line 201 "CSSPropertyNames.gperf" - {"-webkit-marquee-repetition", CSSPropertyWebkitMarqueeRepetition}, +#line 71 "CSSPropertyNames.gperf" + {"margin-right", CSSPropertyMarginRight}, #line 22 "CSSPropertyNames.gperf" {"border-bottom-width", CSSPropertyBorderBottomWidth}, -#line 25 "CSSPropertyNames.gperf" - {"border-left", CSSPropertyBorderLeft}, -#line 199 "CSSPropertyNames.gperf" - {"-webkit-marquee-direction", CSSPropertyWebkitMarqueeDirection}, -#line 26 "CSSPropertyNames.gperf" - {"border-left-color", CSSPropertyBorderLeftColor}, -#line 134 "CSSPropertyNames.gperf" - {"unicode-range", CSSPropertyUnicodeRange}, -#line 10 "CSSPropertyNames.gperf" - {"background", CSSPropertyBackground}, #line 148 "CSSPropertyNames.gperf" - {"-webkit-animation-duration", CSSPropertyWebkitAnimationDuration}, + {"-webkit-background-composite", CSSPropertyWebkitBackgroundComposite}, #line 12 "CSSPropertyNames.gperf" {"background-color", CSSPropertyBackgroundColor}, -#line 181 "CSSPropertyNames.gperf" - {"-webkit-column-break-inside", CSSPropertyWebkitColumnBreakInside}, -#line 104 "CSSPropertyNames.gperf" - {"scrollbar-face-color", CSSPropertyScrollbarFaceColor}, -#line 17 "CSSPropertyNames.gperf" - {"background-repeat", CSSPropertyBackgroundRepeat}, -#line 149 "CSSPropertyNames.gperf" - {"-webkit-animation-iteration-count", CSSPropertyWebkitAnimationIterationCount}, -#line 29 "CSSPropertyNames.gperf" - {"border-right", CSSPropertyBorderRight}, -#line 205 "CSSPropertyNames.gperf" - {"-webkit-mask-attachment", CSSPropertyWebkitMaskAttachment}, -#line 200 "CSSPropertyNames.gperf" - {"-webkit-marquee-increment", CSSPropertyWebkitMarqueeIncrement}, -#line 30 "CSSPropertyNames.gperf" - {"border-right-color", CSSPropertyBorderRightColor}, -#line 112 "CSSPropertyNames.gperf" - {"text-decoration", CSSPropertyTextDecoration}, -#line 113 "CSSPropertyNames.gperf" - {"text-indent", CSSPropertyTextIndent}, -#line 251 "CSSPropertyNames.gperf" - {"color-interpolation-filters", CSSPropertyColorInterpolationFilters}, -#line 55 "CSSPropertyNames.gperf" - {"font-size", CSSPropertyFontSize}, -#line 262 "CSSPropertyNames.gperf" - {"shape-rendering", CSSPropertyShapeRendering}, -#line 14 "CSSPropertyNames.gperf" - {"background-position", CSSPropertyBackgroundPosition}, -#line 243 "CSSPropertyNames.gperf" - {"enable-background", CSSPropertyEnableBackground}, -#line 101 "CSSPropertyNames.gperf" - {"scrollbar-3dlight-color", CSSPropertyScrollbar3dlightColor}, -#line 236 "CSSPropertyNames.gperf" - {"-webkit-user-drag", CSSPropertyWebkitUserDrag}, -#line 143 "CSSPropertyNames.gperf" - {"z-index", CSSPropertyZIndex}, -#line 161 "CSSPropertyNames.gperf" - {"-webkit-border-fit", CSSPropertyWebkitBorderFit}, -#line 183 "CSSPropertyNames.gperf" - {"-webkit-column-gap", CSSPropertyWebkitColumnGap}, -#line 224 "CSSPropertyNames.gperf" - {"-webkit-text-stroke", CSSPropertyWebkitTextStroke}, -#line 225 "CSSPropertyNames.gperf" - {"-webkit-text-stroke-color", CSSPropertyWebkitTextStrokeColor}, +#line 269 "CSSPropertyNames.gperf" + {"stroke-width", CSSPropertyStrokeWidth}, +#line 150 "CSSPropertyNames.gperf" + {"-webkit-background-size", CSSPropertyWebkitBackgroundSize}, +#line 80 "CSSPropertyNames.gperf" + {"outline-color", CSSPropertyOutlineColor}, #line 154 "CSSPropertyNames.gperf" - {"-webkit-background-clip", CSSPropertyWebkitBackgroundClip}, + {"-webkit-border-fit", CSSPropertyWebkitBorderFit}, +#line 128 "CSSPropertyNames.gperf" + {"vertical-align", CSSPropertyVerticalAlign}, +#line 186 "CSSPropertyNames.gperf" + {"-webkit-line-clamp", CSSPropertyWebkitLineClamp}, +#line 249 "CSSPropertyNames.gperf" + {"color-interpolation", CSSPropertyColorInterpolation}, +#line 90 "CSSPropertyNames.gperf" + {"padding-right", CSSPropertyPaddingRight}, +#line 38 "CSSPropertyNames.gperf" + {"border-top-width", CSSPropertyBorderTopWidth}, +#line 23 "CSSPropertyNames.gperf" + {"border-collapse", CSSPropertyBorderCollapse}, +#line 78 "CSSPropertyNames.gperf" + {"orphans", CSSPropertyOrphans}, #line 175 "CSSPropertyNames.gperf" - {"-webkit-box-pack", CSSPropertyWebkitBoxPack}, -#line 227 "CSSPropertyNames.gperf" + {"-webkit-column-count", CSSPropertyWebkitColumnCount}, +#line 224 "CSSPropertyNames.gperf" {"-webkit-transform", CSSPropertyWebkitTransform}, +#line 240 "CSSPropertyNames.gperf" + {"clip-rule", CSSPropertyClipRule}, +#line 58 "CSSPropertyNames.gperf" + {"font-variant", CSSPropertyFontVariant}, +#line 147 "CSSPropertyNames.gperf" + {"-webkit-background-clip", CSSPropertyWebkitBackgroundClip}, +#line 261 "CSSPropertyNames.gperf" + {"shape-rendering", CSSPropertyShapeRendering}, +#line 106 "CSSPropertyNames.gperf" + {"text-indent", CSSPropertyTextIndent}, +#line 94 "CSSPropertyNames.gperf" + {"page-break-before", CSSPropertyPageBreakBefore}, +#line 225 "CSSPropertyNames.gperf" + {"-webkit-transform-origin", CSSPropertyWebkitTransformOrigin}, +#line 93 "CSSPropertyNames.gperf" + {"page-break-after", CSSPropertyPageBreakAfter}, +#line 188 "CSSPropertyNames.gperf" + {"-webkit-margin-collapse", CSSPropertyWebkitMarginCollapse}, +#line 177 "CSSPropertyNames.gperf" + {"-webkit-column-rule", CSSPropertyWebkitColumnRule}, +#line 61 "CSSPropertyNames.gperf" + {"left", CSSPropertyLeft}, +#line 187 "CSSPropertyNames.gperf" + {"-webkit-margin-bottom-collapse", CSSPropertyWebkitMarginBottomCollapse}, +#line 77 "CSSPropertyNames.gperf" + {"opacity", CSSPropertyOpacity}, +#line 270 "CSSPropertyNames.gperf" + {"text-rendering", CSSPropertyTextRendering}, +#line 52 "CSSPropertyNames.gperf" + {"float", CSSPropertyFloat}, +#line 243 "CSSPropertyNames.gperf" + {"filter", CSSPropertyFilter}, #line 167 "CSSPropertyNames.gperf" - {"-webkit-border-vertical-spacing", CSSPropertyWebkitBorderVerticalSpacing}, -#line 174 "CSSPropertyNames.gperf" {"-webkit-box-orient", CSSPropertyWebkitBoxOrient}, +#line 34 "CSSPropertyNames.gperf" + {"border-style", CSSPropertyBorderStyle}, +#line 206 "CSSPropertyNames.gperf" + {"-webkit-mask-position-y", CSSPropertyWebkitMaskPositionY}, +#line 153 "CSSPropertyNames.gperf" + {"-webkit-border-bottom-right-radius", CSSPropertyWebkitBorderBottomRightRadius}, +#line 25 "CSSPropertyNames.gperf" + {"border-left", CSSPropertyBorderLeft}, +#line 198 "CSSPropertyNames.gperf" + {"-webkit-mask-attachment", CSSPropertyWebkitMaskAttachment}, +#line 21 "CSSPropertyNames.gperf" + {"border-bottom-style", CSSPropertyBorderBottomStyle}, +#line 70 "CSSPropertyNames.gperf" + {"margin-left", CSSPropertyMarginLeft}, +#line 139 "CSSPropertyNames.gperf" + {"-webkit-animation-delay", CSSPropertyWebkitAnimationDelay}, +#line 221 "CSSPropertyNames.gperf" + {"-webkit-text-stroke", CSSPropertyWebkitTextStroke}, +#line 160 "CSSPropertyNames.gperf" + {"-webkit-border-vertical-spacing", CSSPropertyWebkitBorderVerticalSpacing}, +#line 268 "CSSPropertyNames.gperf" + {"stroke-opacity", CSSPropertyStrokeOpacity}, +#line 199 "CSSPropertyNames.gperf" + {"-webkit-mask-box-image", CSSPropertyWebkitMaskBoxImage}, +#line 130 "CSSPropertyNames.gperf" + {"white-space", CSSPropertyWhiteSpace}, #line 83 "CSSPropertyNames.gperf" {"outline-width", CSSPropertyOutlineWidth}, -#line 172 "CSSPropertyNames.gperf" - {"-webkit-box-lines", CSSPropertyWebkitBoxLines}, -#line 169 "CSSPropertyNames.gperf" - {"-webkit-box-direction", CSSPropertyWebkitBoxDirection}, -#line 184 "CSSPropertyNames.gperf" - {"-webkit-column-rule", CSSPropertyWebkitColumnRule}, #line 190 "CSSPropertyNames.gperf" - {"-webkit-font-size-delta", CSSPropertyWebkitFontSizeDelta}, -#line 185 "CSSPropertyNames.gperf" - {"-webkit-column-rule-color", CSSPropertyWebkitColumnRuleColor}, -#line 155 "CSSPropertyNames.gperf" - {"-webkit-background-composite", CSSPropertyWebkitBackgroundComposite}, -#line 182 "CSSPropertyNames.gperf" - {"-webkit-column-count", CSSPropertyWebkitColumnCount}, -#line 93 "CSSPropertyNames.gperf" - {"page-break-after", CSSPropertyPageBreakAfter}, + {"-webkit-margin-top-collapse", CSSPropertyWebkitMarginTopCollapse}, +#line 231 "CSSPropertyNames.gperf" + {"-webkit-transition-delay", CSSPropertyWebkitTransitionDelay}, +#line 129 "CSSPropertyNames.gperf" + {"visibility", CSSPropertyVisibility}, +#line 50 "CSSPropertyNames.gperf" + {"display", CSSPropertyDisplay}, +#line 159 "CSSPropertyNames.gperf" + {"-webkit-border-top-right-radius", CSSPropertyWebkitBorderTopRightRadius}, +#line 233 "CSSPropertyNames.gperf" + {"-webkit-transition-property", CSSPropertyWebkitTransitionProperty}, +#line 105 "CSSPropertyNames.gperf" + {"text-decoration", CSSPropertyTextDecoration}, +#line 37 "CSSPropertyNames.gperf" + {"border-top-style", CSSPropertyBorderTopStyle}, +#line 55 "CSSPropertyNames.gperf" + {"font-size", CSSPropertyFontSize}, #line 89 "CSSPropertyNames.gperf" {"padding-left", CSSPropertyPaddingLeft}, -#line 157 "CSSPropertyNames.gperf" - {"-webkit-background-size", CSSPropertyWebkitBackgroundSize}, -#line 247 "CSSPropertyNames.gperf" - {"lighting-color", CSSPropertyLightingColor}, -#line 212 "CSSPropertyNames.gperf" - {"-webkit-mask-position-x", CSSPropertyWebkitMaskPositionX}, -#line 111 "CSSPropertyNames.gperf" - {"text-align", CSSPropertyTextAlign}, -#line 70 "CSSPropertyNames.gperf" - {"margin-left", CSSPropertyMarginLeft}, -#line 256 "CSSPropertyNames.gperf" - {"fill-rule", CSSPropertyFillRule}, -#line 94 "CSSPropertyNames.gperf" - {"page-break-before", CSSPropertyPageBreakBefore}, -#line 90 "CSSPropertyNames.gperf" - {"padding-right", CSSPropertyPaddingRight}, -#line 271 "CSSPropertyNames.gperf" - {"text-rendering", CSSPropertyTextRendering}, -#line 58 "CSSPropertyNames.gperf" - {"font-variant", CSSPropertyFontVariant}, #line 84 "CSSPropertyNames.gperf" {"overflow", CSSPropertyOverflow}, -#line 71 "CSSPropertyNames.gperf" - {"margin-right", CSSPropertyMarginRight}, -#line 120 "CSSPropertyNames.gperf" - {"text-overline", CSSPropertyTextOverline}, -#line 13 "CSSPropertyNames.gperf" - {"background-image", CSSPropertyBackgroundImage}, -#line 121 "CSSPropertyNames.gperf" - {"text-overline-color", CSSPropertyTextOverlineColor}, -#line 60 "CSSPropertyNames.gperf" - {"height", CSSPropertyHeight}, -#line 56 "CSSPropertyNames.gperf" - {"font-stretch", CSSPropertyFontStretch}, +#line 30 "CSSPropertyNames.gperf" + {"border-right-color", CSSPropertyBorderRightColor}, #line 162 "CSSPropertyNames.gperf" - {"-webkit-border-horizontal-spacing", CSSPropertyWebkitBorderHorizontalSpacing}, -#line 188 "CSSPropertyNames.gperf" - {"-webkit-column-width", CSSPropertyWebkitColumnWidth}, -#line 63 "CSSPropertyNames.gperf" - {"line-height", CSSPropertyLineHeight}, -#line 127 "CSSPropertyNames.gperf" - {"text-underline", CSSPropertyTextUnderline}, -#line 278 "CSSPropertyNames.gperf" - {"text-anchor", CSSPropertyTextAnchor}, -#line 128 "CSSPropertyNames.gperf" - {"text-underline-color", CSSPropertyTextUnderlineColor}, -#line 122 "CSSPropertyNames.gperf" - {"text-overline-mode", CSSPropertyTextOverlineMode}, -#line 156 "CSSPropertyNames.gperf" - {"-webkit-background-origin", CSSPropertyWebkitBackgroundOrigin}, -#line 168 "CSSPropertyNames.gperf" - {"-webkit-box-align", CSSPropertyWebkitBoxAlign}, -#line 273 "CSSPropertyNames.gperf" - {"baseline-shift", CSSPropertyBaselineShift}, -#line 75 "CSSPropertyNames.gperf" - {"min-height", CSSPropertyMinHeight}, -#line 228 "CSSPropertyNames.gperf" - {"-webkit-transform-origin", CSSPropertyWebkitTransformOrigin}, -#line 129 "CSSPropertyNames.gperf" - {"text-underline-mode", CSSPropertyTextUnderlineMode}, -#line 28 "CSSPropertyNames.gperf" - {"border-left-width", CSSPropertyBorderLeftWidth}, -#line 125 "CSSPropertyNames.gperf" - {"text-shadow", CSSPropertyTextShadow}, -#line 77 "CSSPropertyNames.gperf" - {"opacity", CSSPropertyOpacity}, + {"-webkit-box-direction", CSSPropertyWebkitBoxDirection}, +#line 248 "CSSPropertyNames.gperf" + {"stop-opacity", CSSPropertyStopOpacity}, +#line 104 "CSSPropertyNames.gperf" + {"text-align", CSSPropertyTextAlign}, +#line 144 "CSSPropertyNames.gperf" + {"-webkit-animation-timing-function", CSSPropertyWebkitAnimationTimingFunction}, +#line 253 "CSSPropertyNames.gperf" + {"fill", CSSPropertyFill}, +#line 196 "CSSPropertyNames.gperf" + {"-webkit-marquee-style", CSSPropertyWebkitMarqueeStyle}, +#line 16 "CSSPropertyNames.gperf" + {"background-position-y", CSSPropertyBackgroundPositionY}, #line 11 "CSSPropertyNames.gperf" {"background-attachment", CSSPropertyBackgroundAttachment}, -#line 216 "CSSPropertyNames.gperf" - {"-webkit-match-nearest-mail-blockquote-color", CSSPropertyWebkitMatchNearestMailBlockquoteColor}, -#line 249 "CSSPropertyNames.gperf" - {"stop-opacity", CSSPropertyStopOpacity}, -#line 269 "CSSPropertyNames.gperf" - {"stroke-opacity", CSSPropertyStrokeOpacity}, +#line 161 "CSSPropertyNames.gperf" + {"-webkit-box-align", CSSPropertyWebkitBoxAlign}, +#line 205 "CSSPropertyNames.gperf" + {"-webkit-mask-position-x", CSSPropertyWebkitMaskPositionX}, +#line 136 "CSSPropertyNames.gperf" + {"z-index", CSSPropertyZIndex}, +#line 234 "CSSPropertyNames.gperf" + {"-webkit-transition-timing-function", CSSPropertyWebkitTransitionTimingFunction}, #line 64 "CSSPropertyNames.gperf" {"list-style", CSSPropertyListStyle}, -#line 50 "CSSPropertyNames.gperf" - {"display", CSSPropertyDisplay}, -#line 32 "CSSPropertyNames.gperf" - {"border-right-width", CSSPropertyBorderRightWidth}, -#line 74 "CSSPropertyNames.gperf" - {"max-width", CSSPropertyMaxWidth}, +#line 168 "CSSPropertyNames.gperf" + {"-webkit-box-pack", CSSPropertyWebkitBoxPack}, #line 165 "CSSPropertyNames.gperf" - {"-webkit-border-top-left-radius", CSSPropertyWebkitBorderTopLeftRadius}, -#line 178 "CSSPropertyNames.gperf" + {"-webkit-box-lines", CSSPropertyWebkitBoxLines}, +#line 228 "CSSPropertyNames.gperf" + {"-webkit-transform-origin-z", CSSPropertyWebkitTransformOriginZ}, +#line 152 "CSSPropertyNames.gperf" + {"-webkit-border-bottom-left-radius", CSSPropertyWebkitBorderBottomLeftRadius}, +#line 103 "CSSPropertyNames.gperf" + {"table-layout", CSSPropertyTableLayout}, +#line 181 "CSSPropertyNames.gperf" + {"-webkit-column-width", CSSPropertyWebkitColumnWidth}, +#line 65 "CSSPropertyNames.gperf" + {"list-style-image", CSSPropertyListStyleImage}, +#line 113 "CSSPropertyNames.gperf" + {"text-overline", CSSPropertyTextOverline}, +#line 120 "CSSPropertyNames.gperf" + {"text-underline", CSSPropertyTextUnderline}, +#line 115 "CSSPropertyNames.gperf" + {"text-overline-mode", CSSPropertyTextOverlineMode}, +#line 122 "CSSPropertyNames.gperf" + {"text-underline-mode", CSSPropertyTextUnderlineMode}, +#line 82 "CSSPropertyNames.gperf" + {"outline-style", CSSPropertyOutlineStyle}, +#line 239 "CSSPropertyNames.gperf" + {"clip-path", CSSPropertyClipPath}, +#line 60 "CSSPropertyNames.gperf" + {"height", CSSPropertyHeight}, +#line 238 "CSSPropertyNames.gperf" + {"-webkit-variable-declaration-block", CSSPropertyWebkitVariableDeclarationBlock}, +#line 75 "CSSPropertyNames.gperf" + {"min-height", CSSPropertyMinHeight}, +#line 171 "CSSPropertyNames.gperf" {"-webkit-box-sizing", CSSPropertyWebkitBoxSizing}, -#line 179 "CSSPropertyNames.gperf" +#line 246 "CSSPropertyNames.gperf" + {"lighting-color", CSSPropertyLightingColor}, +#line 173 "CSSPropertyNames.gperf" + {"-webkit-column-break-before", CSSPropertyWebkitColumnBreakBefore}, +#line 178 "CSSPropertyNames.gperf" + {"-webkit-column-rule-color", CSSPropertyWebkitColumnRuleColor}, +#line 172 "CSSPropertyNames.gperf" {"-webkit-column-break-after", CSSPropertyWebkitColumnBreakAfter}, +#line 215 "CSSPropertyNames.gperf" + {"-webkit-perspective-origin-y", CSSPropertyWebkitPerspectiveOriginY}, +#line 158 "CSSPropertyNames.gperf" + {"-webkit-border-top-left-radius", CSSPropertyWebkitBorderTopLeftRadius}, +#line 244 "CSSPropertyNames.gperf" + {"flood-color", CSSPropertyFloodColor}, +#line 26 "CSSPropertyNames.gperf" + {"border-left-color", CSSPropertyBorderLeftColor}, +#line 32 "CSSPropertyNames.gperf" + {"border-right-width", CSSPropertyBorderRightWidth}, +#line 183 "CSSPropertyNames.gperf" + {"-webkit-font-size-delta", CSSPropertyWebkitFontSizeDelta}, +#line 15 "CSSPropertyNames.gperf" + {"background-position-x", CSSPropertyBackgroundPositionX}, +#line 222 "CSSPropertyNames.gperf" + {"-webkit-text-stroke-color", CSSPropertyWebkitTextStrokeColor}, +#line 59 "CSSPropertyNames.gperf" + {"font-weight", CSSPropertyFontWeight}, +#line 66 "CSSPropertyNames.gperf" + {"list-style-position", CSSPropertyListStylePosition}, #line 51 "CSSPropertyNames.gperf" {"empty-cells", CSSPropertyEmptyCells}, -#line 34 "CSSPropertyNames.gperf" - {"border-style", CSSPropertyBorderStyle}, -#line 37 "CSSPropertyNames.gperf" - {"border-top-style", CSSPropertyBorderTopStyle}, -#line 206 "CSSPropertyNames.gperf" - {"-webkit-mask-box-image", CSSPropertyWebkitMaskBoxImage}, -#line 180 "CSSPropertyNames.gperf" - {"-webkit-column-break-before", CSSPropertyWebkitColumnBreakBefore}, #line 166 "CSSPropertyNames.gperf" - {"-webkit-border-top-right-radius", CSSPropertyWebkitBorderTopRightRadius}, -#line 66 "CSSPropertyNames.gperf" - {"list-style-position", CSSPropertyListStylePosition}, -#line 223 "CSSPropertyNames.gperf" + {"-webkit-box-ordinal-group", CSSPropertyWebkitBoxOrdinalGroup}, +#line 263 "CSSPropertyNames.gperf" + {"stroke-dasharray", CSSPropertyStrokeDasharray}, +#line 251 "CSSPropertyNames.gperf" + {"color-profile", CSSPropertyColorProfile}, +#line 220 "CSSPropertyNames.gperf" {"-webkit-text-size-adjust", CSSPropertyWebkitTextSizeAdjust}, -#line 159 "CSSPropertyNames.gperf" - {"-webkit-border-bottom-left-radius", CSSPropertyWebkitBorderBottomLeftRadius}, -#line 226 "CSSPropertyNames.gperf" - {"-webkit-text-stroke-width", CSSPropertyWebkitTextStrokeWidth}, -#line 177 "CSSPropertyNames.gperf" +#line 255 "CSSPropertyNames.gperf" + {"fill-rule", CSSPropertyFillRule}, +#line 63 "CSSPropertyNames.gperf" + {"line-height", CSSPropertyLineHeight}, +#line 227 "CSSPropertyNames.gperf" + {"-webkit-transform-origin-y", CSSPropertyWebkitTransformOriginY}, +#line 74 "CSSPropertyNames.gperf" + {"max-width", CSSPropertyMaxWidth}, +#line 214 "CSSPropertyNames.gperf" + {"-webkit-perspective-origin-x", CSSPropertyWebkitPerspectiveOriginX}, +#line 236 "CSSPropertyNames.gperf" + {"-webkit-user-modify", CSSPropertyWebkitUserModify}, +#line 56 "CSSPropertyNames.gperf" + {"font-stretch", CSSPropertyFontStretch}, +#line 180 "CSSPropertyNames.gperf" + {"-webkit-column-rule-width", CSSPropertyWebkitColumnRuleWidth}, +#line 118 "CSSPropertyNames.gperf" + {"text-shadow", CSSPropertyTextShadow}, +#line 31 "CSSPropertyNames.gperf" + {"border-right-style", CSSPropertyBorderRightStyle}, +#line 57 "CSSPropertyNames.gperf" + {"font-style", CSSPropertyFontStyle}, +#line 28 "CSSPropertyNames.gperf" + {"border-left-width", CSSPropertyBorderLeftWidth}, +#line 170 "CSSPropertyNames.gperf" {"-webkit-box-shadow", CSSPropertyWebkitBoxShadow}, -#line 21 "CSSPropertyNames.gperf" - {"border-bottom-style", CSSPropertyBorderBottomStyle}, -#line 59 "CSSPropertyNames.gperf" - {"font-weight", CSSPropertyFontWeight}, -#line 160 "CSSPropertyNames.gperf" - {"-webkit-border-bottom-right-radius", CSSPropertyWebkitBorderBottomRightRadius}, -#line 126 "CSSPropertyNames.gperf" +#line 114 "CSSPropertyNames.gperf" + {"text-overline-color", CSSPropertyTextOverlineColor}, +#line 121 "CSSPropertyNames.gperf" + {"text-underline-color", CSSPropertyTextUnderlineColor}, +#line 223 "CSSPropertyNames.gperf" + {"-webkit-text-stroke-width", CSSPropertyWebkitTextStrokeWidth}, +#line 119 "CSSPropertyNames.gperf" {"text-transform", CSSPropertyTextTransform}, -#line 234 "CSSPropertyNames.gperf" - {"-webkit-transition-property", CSSPropertyWebkitTransitionProperty}, -#line 187 "CSSPropertyNames.gperf" - {"-webkit-column-rule-width", CSSPropertyWebkitColumnRuleWidth}, -#line 15 "CSSPropertyNames.gperf" - {"background-position-x", CSSPropertyBackgroundPositionX}, -#line 221 "CSSPropertyNames.gperf" - {"-webkit-text-fill-color", CSSPropertyWebkitTextFillColor}, -#line 232 "CSSPropertyNames.gperf" - {"-webkit-transition-delay", CSSPropertyWebkitTransitionDelay}, -#line 176 "CSSPropertyNames.gperf" - {"-webkit-box-reflect", CSSPropertyWebkitBoxReflect}, -#line 213 "CSSPropertyNames.gperf" - {"-webkit-mask-position-y", CSSPropertyWebkitMaskPositionY}, -#line 146 "CSSPropertyNames.gperf" - {"-webkit-animation-delay", CSSPropertyWebkitAnimationDelay}, -#line 151 "CSSPropertyNames.gperf" - {"-webkit-animation-play-state", CSSPropertyWebkitAnimationPlayState}, -#line 173 "CSSPropertyNames.gperf" - {"-webkit-box-ordinal-group", CSSPropertyWebkitBoxOrdinalGroup}, -#line 124 "CSSPropertyNames.gperf" - {"text-overline-width", CSSPropertyTextOverlineWidth}, -#line 65 "CSSPropertyNames.gperf" - {"list-style-image", CSSPropertyListStyleImage}, -#line 82 "CSSPropertyNames.gperf" - {"outline-style", CSSPropertyOutlineStyle}, -#line 110 "CSSPropertyNames.gperf" - {"table-layout", CSSPropertyTableLayout}, -#line 136 "CSSPropertyNames.gperf" - {"visibility", CSSPropertyVisibility}, -#line 131 "CSSPropertyNames.gperf" - {"text-underline-width", CSSPropertyTextUnderlineWidth}, -#line 235 "CSSPropertyNames.gperf" - {"-webkit-transition-timing-function", CSSPropertyWebkitTransitionTimingFunction}, +#line 155 "CSSPropertyNames.gperf" + {"-webkit-border-horizontal-spacing", CSSPropertyWebkitBorderHorizontalSpacing}, +#line 277 "CSSPropertyNames.gperf" + {"text-anchor", CSSPropertyTextAnchor}, +#line 272 "CSSPropertyNames.gperf" + {"baseline-shift", CSSPropertyBaselineShift}, +#line 86 "CSSPropertyNames.gperf" + {"overflow-y", CSSPropertyOverflowY}, +#line 226 "CSSPropertyNames.gperf" + {"-webkit-transform-origin-x", CSSPropertyWebkitTransformOriginX}, +#line 229 "CSSPropertyNames.gperf" + {"-webkit-transform-style", CSSPropertyWebkitTransformStyle}, #line 81 "CSSPropertyNames.gperf" {"outline-offset", CSSPropertyOutlineOffset}, -#line 152 "CSSPropertyNames.gperf" - {"-webkit-animation-timing-function", CSSPropertyWebkitAnimationTimingFunction}, -#line 264 "CSSPropertyNames.gperf" - {"stroke-dasharray", CSSPropertyStrokeDasharray}, +#line 250 "CSSPropertyNames.gperf" + {"color-interpolation-filters", CSSPropertyColorInterpolationFilters}, +#line 179 "CSSPropertyNames.gperf" + {"-webkit-column-rule-style", CSSPropertyWebkitColumnRuleStyle}, +#line 245 "CSSPropertyNames.gperf" + {"flood-opacity", CSSPropertyFloodOpacity}, +#line 27 "CSSPropertyNames.gperf" + {"border-left-style", CSSPropertyBorderLeftStyle}, +#line 219 "CSSPropertyNames.gperf" + {"-webkit-text-security", CSSPropertyWebkitTextSecurity}, +#line 117 "CSSPropertyNames.gperf" + {"text-overline-width", CSSPropertyTextOverlineWidth}, +#line 124 "CSSPropertyNames.gperf" + {"text-underline-width", CSSPropertyTextUnderlineWidth}, #line 85 "CSSPropertyNames.gperf" {"overflow-x", CSSPropertyOverflowX}, -#line 119 "CSSPropertyNames.gperf" +#line 112 "CSSPropertyNames.gperf" {"text-overflow", CSSPropertyTextOverflow}, -#line 265 "CSSPropertyNames.gperf" - {"stroke-dashoffset", CSSPropertyStrokeDashoffset}, +#line 67 "CSSPropertyNames.gperf" + {"list-style-type", CSSPropertyListStyleType}, +#line 169 "CSSPropertyNames.gperf" + {"-webkit-box-reflect", CSSPropertyWebkitBoxReflect}, +#line 254 "CSSPropertyNames.gperf" + {"fill-opacity", CSSPropertyFillOpacity}, +#line 146 "CSSPropertyNames.gperf" + {"-webkit-backface-visibility", CSSPropertyWebkitBackfaceVisibility}, #line 73 "CSSPropertyNames.gperf" {"max-height", CSSPropertyMaxHeight}, -#line 105 "CSSPropertyNames.gperf" - {"scrollbar-highlight-color", CSSPropertyScrollbarHighlightColor}, -#line 203 "CSSPropertyNames.gperf" - {"-webkit-marquee-style", CSSPropertyWebkitMarqueeStyle}, -#line 255 "CSSPropertyNames.gperf" - {"fill-opacity", CSSPropertyFillOpacity}, -#line 57 "CSSPropertyNames.gperf" - {"font-style", CSSPropertyFontStyle}, -#line 229 "CSSPropertyNames.gperf" - {"-webkit-transform-origin-x", CSSPropertyWebkitTransformOriginX}, -#line 246 "CSSPropertyNames.gperf" - {"flood-opacity", CSSPropertyFloodOpacity}, -#line 191 "CSSPropertyNames.gperf" - {"-webkit-highlight", CSSPropertyWebkitHighlight}, -#line 27 "CSSPropertyNames.gperf" - {"border-left-style", CSSPropertyBorderLeftStyle}, -#line 31 "CSSPropertyNames.gperf" - {"border-right-style", CSSPropertyBorderRightStyle}, -#line 16 "CSSPropertyNames.gperf" - {"background-position-y", CSSPropertyBackgroundPositionY}, -#line 114 "CSSPropertyNames.gperf" - {"text-line-through", CSSPropertyTextLineThrough}, -#line 115 "CSSPropertyNames.gperf" - {"text-line-through-color", CSSPropertyTextLineThroughColor}, -#line 186 "CSSPropertyNames.gperf" - {"-webkit-column-rule-style", CSSPropertyWebkitColumnRuleStyle}, -#line 170 "CSSPropertyNames.gperf" - {"-webkit-box-flex", CSSPropertyWebkitBoxFlex}, -#line 220 "CSSPropertyNames.gperf" - {"-webkit-text-decorations-in-effect", CSSPropertyWebkitTextDecorationsInEffect}, -#line 86 "CSSPropertyNames.gperf" - {"overflow-y", CSSPropertyOverflowY}, #line 116 "CSSPropertyNames.gperf" - {"text-line-through-mode", CSSPropertyTextLineThroughMode}, -#line 123 "CSSPropertyNames.gperf" {"text-overline-style", CSSPropertyTextOverlineStyle}, -#line 276 "CSSPropertyNames.gperf" - {"glyph-orientation-vertical", CSSPropertyGlyphOrientationVertical}, -#line 130 "CSSPropertyNames.gperf" +#line 123 "CSSPropertyNames.gperf" {"text-underline-style", CSSPropertyTextUnderlineStyle}, -#line 230 "CSSPropertyNames.gperf" - {"-webkit-transform-origin-y", CSSPropertyWebkitTransformOriginY}, -#line 222 "CSSPropertyNames.gperf" - {"-webkit-text-security", CSSPropertyWebkitTextSecurity}, -#line 237 "CSSPropertyNames.gperf" - {"-webkit-user-modify", CSSPropertyWebkitUserModify}, -#line 67 "CSSPropertyNames.gperf" - {"list-style-type", CSSPropertyListStyleType}, +#line 209 "CSSPropertyNames.gperf" + {"-webkit-match-nearest-mail-blockquote-color", CSSPropertyWebkitMatchNearestMailBlockquoteColor}, +#line 184 "CSSPropertyNames.gperf" + {"-webkit-highlight", CSSPropertyWebkitHighlight}, #line 275 "CSSPropertyNames.gperf" - {"glyph-orientation-horizontal", CSSPropertyGlyphOrientationHorizontal}, + {"glyph-orientation-vertical", CSSPropertyGlyphOrientationVertical}, +#line 264 "CSSPropertyNames.gperf" + {"stroke-dashoffset", CSSPropertyStrokeDashoffset}, #line 54 "CSSPropertyNames.gperf" {"font-family", CSSPropertyFontFamily}, -#line 118 "CSSPropertyNames.gperf" - {"text-line-through-width", CSSPropertyTextLineThroughWidth}, -#line 171 "CSSPropertyNames.gperf" +#line 218 "CSSPropertyNames.gperf" + {"-webkit-text-fill-color", CSSPropertyWebkitTextFillColor}, +#line 107 "CSSPropertyNames.gperf" + {"text-line-through", CSSPropertyTextLineThrough}, +#line 109 "CSSPropertyNames.gperf" + {"text-line-through-mode", CSSPropertyTextLineThroughMode}, +#line 163 "CSSPropertyNames.gperf" + {"-webkit-box-flex", CSSPropertyWebkitBoxFlex}, +#line 217 "CSSPropertyNames.gperf" + {"-webkit-text-decorations-in-effect", CSSPropertyWebkitTextDecorationsInEffect}, +#line 274 "CSSPropertyNames.gperf" + {"glyph-orientation-horizontal", CSSPropertyGlyphOrientationHorizontal}, +#line 108 "CSSPropertyNames.gperf" + {"text-line-through-color", CSSPropertyTextLineThroughColor}, +#line 164 "CSSPropertyNames.gperf" {"-webkit-box-flex-group", CSSPropertyWebkitBoxFlexGroup}, -#line 117 "CSSPropertyNames.gperf" +#line 111 "CSSPropertyNames.gperf" + {"text-line-through-width", CSSPropertyTextLineThroughWidth}, +#line 110 "CSSPropertyNames.gperf" {"text-line-through-style", CSSPropertyTextLineThroughStyle} }; static const short lookup[] = { - -1, -1, -1, 0, -1, 1, -1, -1, -1, 2, - 3, -1, -1, 4, -1, -1, 5, -1, -1, -1, - 6, -1, -1, -1, -1, -1, -1, 7, -1, -1, - -1, -1, -1, -1, -1, -1, 8, -1, 9, 10, - 11, 12, 13, -1, 14, -1, 15, -1, -1, 16, - -1, -1, -1, -1, 17, 18, 19, 20, -1, -1, - 21, 22, 23, -1, 24, 25, 26, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 27, - -1, -1, -1, -1, -1, 28, -1, -1, -1, -1, - 29, -1, -1, 30, -1, -1, -1, -1, -1, 31, - -1, 32, 33, -1, 34, -1, -1, -1, 35, -1, - -1, 36, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 37, 38, -1, -1, -1, -1, 39, -1, - -1, -1, 40, 41, 42, -1, -1, 43, -1, -1, - -1, -1, -1, -1, 44, -1, -1, -1, -1, -1, - -1, -1, 45, -1, -1, -1, -1, -1, -1, -1, - -1, 46, 47, -1, -1, -1, -1, 48, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 49, -1, 50, - -1, -1, 51, -1, -1, 52, 53, 54, -1, -1, - -1, 55, 56, -1, -1, 57, -1, -1, -1, 58, - -1, 59, 60, -1, -1, -1, -1, 61, -1, 62, - -1, -1, -1, 63, -1, -1, -1, -1, 64, 65, - -1, -1, 66, -1, -1, -1, -1, 67, -1, 68, - -1, 69, -1, -1, -1, -1, -1, -1, -1, 70, - -1, -1, 71, -1, -1, 72, -1, 73, 74, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 75, 76, -1, -1, -1, 77, -1, -1, - 78, -1, -1, -1, -1, 79, 80, -1, -1, -1, - -1, 81, -1, -1, 82, 83, -1, 84, 85, 86, - 87, -1, 88, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 89, -1, -1, -1, 90, -1, -1, - -1, 91, -1, -1, -1, 92, -1, -1, -1, 93, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 94, - 95, 96, 97, -1, 98, 99, 100, -1, -1, 101, - -1, -1, -1, 102, -1, 103, 104, -1, -1, 105, - -1, 106, 107, -1, -1, 108, 109, -1, -1, 110, - 111, 112, -1, -1, 113, -1, 114, -1, -1, -1, - 115, -1, 116, 117, -1, 118, 119, -1, -1, -1, - -1, 120, 121, -1, -1, 122, -1, 123, 124, -1, - -1, -1, 125, 126, -1, 127, -1, -1, 128, -1, - 129, 130, 131, -1, 132, -1, -1, -1, -1, -1, - 133, -1, -1, -1, 134, -1, -1, 135, 136, -1, - -1, -1, -1, -1, -1, -1, -1, 137, -1, -1, - -1, -1, 138, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 139, -1, -1, -1, -1, 140, 141, - -1, -1, -1, -1, -1, 142, -1, -1, 143, -1, - -1, 144, 145, -1, -1, -1, -1, -1, -1, -1, - -1, 146, -1, 147, -1, -1, -1, -1, 148, -1, - -1, -1, 149, -1, -1, -1, -1, -1, -1, -1, - -1, 150, -1, -1, 151, -1, -1, -1, 152, -1, - 153, -1, -1, 154, -1, 155, -1, -1, -1, -1, - -1, 156, 157, 158, 159, -1, -1, -1, 160, -1, - 161, 162, -1, -1, 163, -1, -1, 164, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 165, 166, - -1, -1, 167, 168, -1, -1, -1, 169, -1, -1, - -1, -1, -1, 170, -1, -1, 171, -1, -1, 172, - -1, -1, -1, -1, -1, -1, 173, 174, 175, -1, - -1, -1, -1, -1, -1, 176, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 177, -1, -1, 178, - -1, 179, -1, -1, -1, 180, -1, -1, 181, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 182, -1, 183, -1, 184, 185, -1, -1, -1, -1, - -1, -1, -1, -1, 186, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 187, -1, -1, 188, -1, -1, - -1, 189, 190, -1, -1, -1, 191, -1, -1, -1, - -1, -1, -1, 192, -1, -1, -1, 193, -1, 194, - 195, -1, 196, 197, 198, 199, -1, -1, 200, -1, - -1, 201, -1, -1, -1, -1, 202, 203, -1, -1, - -1, 204, 205, -1, -1, -1, -1, 206, -1, -1, - -1, 207, -1, -1, -1, -1, -1, -1, -1, 208, + -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 1, -1, -1, -1, + -1, 2, -1, 3, -1, 4, 5, 6, -1, -1, + 7, -1, -1, 8, 9, -1, 10, -1, -1, -1, + 11, -1, 12, -1, -1, 13, -1, -1, -1, -1, + 14, -1, 15, -1, -1, 16, -1, 17, 18, -1, + -1, 19, 20, -1, -1, -1, -1, 21, -1, 22, + -1, -1, -1, 23, -1, 24, -1, 25, 26, 27, + -1, -1, -1, -1, 28, 29, -1, -1, -1, -1, + 30, -1, 31, 32, 33, -1, -1, -1, -1, -1, + -1, 34, -1, -1, -1, -1, -1, -1, 35, 36, + 37, -1, -1, -1, -1, -1, -1, 38, -1, -1, + -1, -1, 39, -1, -1, -1, 40, 41, -1, 42, + -1, 43, -1, -1, -1, -1, 44, -1, -1, -1, + -1, 45, 46, -1, -1, -1, -1, 47, -1, 48, + -1, 49, 50, 51, -1, 52, -1, 53, -1, -1, + 54, -1, -1, 55, 56, 57, 58, 59, -1, -1, + -1, 60, 61, -1, 62, -1, -1, 63, 64, -1, + -1, 65, -1, -1, -1, -1, 66, -1, -1, -1, + 67, -1, -1, -1, 68, 69, 70, -1, -1, -1, + 71, -1, 72, -1, -1, 73, -1, 74, -1, -1, + 75, -1, -1, 76, 77, -1, -1, -1, -1, -1, + -1, -1, 78, -1, -1, 79, -1, 80, -1, -1, + -1, -1, 81, -1, -1, -1, -1, -1, -1, 82, + -1, -1, 83, 84, -1, -1, -1, -1, -1, 85, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 86, -1, -1, -1, + -1, -1, -1, -1, -1, 87, -1, 88, -1, -1, + -1, -1, -1, 89, -1, -1, -1, -1, -1, 90, + 91, -1, -1, -1, 92, -1, -1, 93, -1, -1, + -1, -1, -1, -1, 94, -1, -1, -1, -1, -1, + 95, -1, -1, -1, -1, 96, -1, 97, -1, 98, + -1, -1, -1, -1, 99, -1, 100, 101, -1, -1, + -1, -1, 102, 103, 104, -1, -1, 105, -1, 106, + -1, -1, -1, 107, -1, -1, 108, -1, -1, -1, + -1, -1, 109, 110, -1, -1, -1, -1, 111, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 112, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 113, + -1, -1, -1, 114, 115, -1, -1, -1, 116, -1, + -1, 117, -1, -1, -1, 118, -1, 119, -1, -1, + 120, -1, 121, -1, 122, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 123, 124, -1, + 125, 126, 127, -1, 128, -1, 129, -1, 130, 131, + -1, -1, -1, -1, 132, 133, -1, 134, -1, 135, + 136, 137, -1, 138, -1, -1, -1, 139, 140, 141, + -1, 142, -1, 143, 144, -1, -1, -1, -1, -1, + -1, 145, -1, 146, 147, -1, -1, -1, -1, -1, + -1, 148, -1, -1, 149, -1, -1, 150, -1, -1, + -1, 151, -1, 152, -1, -1, -1, 153, -1, 154, + 155, -1, 156, -1, -1, -1, -1, -1, -1, -1, + -1, 157, 158, -1, -1, 159, 160, -1, -1, 161, + -1, -1, 162, 163, -1, -1, -1, -1, 164, -1, + -1, 165, 166, -1, -1, -1, -1, -1, -1, -1, + 167, -1, -1, -1, -1, -1, -1, -1, 168, 169, + -1, 170, -1, -1, -1, -1, 171, -1, -1, -1, + -1, 172, 173, 174, -1, -1, -1, 175, -1, -1, + -1, -1, -1, -1, 176, 177, 178, 179, -1, -1, + -1, 180, -1, 181, -1, -1, -1, 182, -1, -1, + 183, 184, -1, 185, 186, -1, -1, -1, 187, 188, + -1, -1, -1, -1, -1, -1, -1, -1, 189, 190, + -1, 191, -1, -1, 192, -1, -1, -1, -1, -1, + 193, -1, -1, 194, 195, -1, -1, 196, -1, -1, + 197, 198, -1, 199, -1, 200, 201, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 202, 203, -1, -1, -1, -1, 204, -1, + -1, 205, -1, -1, -1, 206, 207, -1, -1, 208, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 209, -1, -1, -1, 210, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 211, -1, 212, 213, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 214, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 215, -1, -1, -1, + -1, 216, -1, -1, 217, -1, -1, -1, 218, -1, + -1, -1, -1, -1, 219, -1, -1, -1, -1, -1, + -1, -1, 220, -1, -1, 221, -1, -1, -1, -1, + -1, 222, -1, -1, -1, -1, -1, -1, 223, -1, + -1, -1, -1, -1, -1, 224, -1, 225, -1, -1, + -1, -1, -1, 226, 227, 228, -1, -1, -1, -1, + 229, -1, -1, -1, 230, -1, -1, -1, 231, -1, + -1, -1, -1, -1, -1, -1, 232, -1, -1, 233, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 234, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 235, -1, -1, -1, + -1, -1, -1, 236, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 237, + -1, -1, 238, -1, -1, -1, -1, -1, -1, -1, + 239, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 240, -1, -1, -1, -1, -1, -1, + -1, -1, 241, -1, -1, -1, 242, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 243, + 244, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 245, -1, -1, 246, -1, + 247, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 248, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 249, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 250, -1, -1, + 251, -1, -1, -1, 252, 253, -1, -1, 254, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 255, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 256, 257, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 209, -1, -1, -1, 210, -1, - 211, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 212, 213, -1, 214, -1, -1, -1, - -1, -1, -1, -1, 215, -1, -1, -1, -1, 216, + -1, 258, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 217, -1, -1, 218, -1, -1, -1, -1, - -1, 219, -1, 220, 221, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 222, -1, -1, -1, 223, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 224, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 225, -1, - -1, -1, -1, -1, -1, 226, -1, -1, -1, -1, - -1, -1, -1, -1, 227, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 228, -1, -1, -1, -1, -1, -1, 229, -1, - -1, -1, 230, -1, -1, 231, -1, -1, -1, -1, - 232, -1, -1, -1, 233, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 234, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 235, -1, - -1, -1, -1, -1, -1, -1, 236, -1, -1, -1, - 237, -1, -1, 238, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 239, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 240, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 241, 242, -1, -1, -1, -1, -1, 243, -1, -1, - 244, 245, -1, 246, -1, -1, -1, -1, -1, -1, - -1, -1, 247, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 248, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 259, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 249, -1, -1, -1, -1, -1, -1, - -1, 250, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 260, -1, -1, + -1, -1, 261, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -891,47 +903,30 @@ findProp (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 251, -1, -1, - -1, -1, -1, 252, -1, 253, 254, -1, -1, -1, + -1, 262, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 255, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 256, -1, 257, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 258, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 259, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 260, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 261, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 262, -1, -1, -1, -1, -1, -1, -1, 263, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 264, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 265, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 266, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 267, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 264, -1, -1, -1, -1, 265, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 266, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 268, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 267, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -942,20 +937,7 @@ findProp (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 269 + -1, -1, -1, -1, -1, -1, -1, -1, 268 }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -977,9 +959,9 @@ findProp (register const char *str, register unsigned int len) } return 0; } -#line 280 "CSSPropertyNames.gperf" +#line 279 "CSSPropertyNames.gperf" -static const char * const propertyNameStrings[270] = { +static const char * const propertyNameStrings[269] = { "background", "background-attachment", "background-color", @@ -1071,13 +1053,6 @@ static const char * const propertyNameStrings[270] = { "quotes", "resize", "right", -"scrollbar-3dlight-color", -"scrollbar-arrow-color", -"scrollbar-darkshadow-color", -"scrollbar-face-color", -"scrollbar-highlight-color", -"scrollbar-shadow-color", -"scrollbar-track-color", "size", "src", "table-layout", @@ -1121,9 +1096,9 @@ static const char * const propertyNameStrings[270] = { "-webkit-animation-duration", "-webkit-animation-iteration-count", "-webkit-animation-name", -"-webkit-animation-play-state", "-webkit-animation-timing-function", "-webkit-appearance", +"-webkit-backface-visibility", "-webkit-background-clip", "-webkit-background-composite", "-webkit-background-origin", @@ -1189,6 +1164,10 @@ static const char * const propertyNameStrings[270] = { "-webkit-match-nearest-mail-blockquote-color", "-webkit-nbsp-mode", "-webkit-padding-start", +"-webkit-perspective", +"-webkit-perspective-origin", +"-webkit-perspective-origin-x", +"-webkit-perspective-origin-y", "-webkit-rtl-ordering", "-webkit-text-decorations-in-effect", "-webkit-text-fill-color", @@ -1201,6 +1180,8 @@ static const char * const propertyNameStrings[270] = { "-webkit-transform-origin", "-webkit-transform-origin-x", "-webkit-transform-origin-y", +"-webkit-transform-origin-z", +"-webkit-transform-style", "-webkit-transition", "-webkit-transition-delay", "-webkit-transition-duration", diff --git a/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.h b/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.h index 095c2c0522..aaddf05631 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.h +++ b/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.h @@ -96,189 +96,188 @@ enum CSSPropertyID { CSSPropertyQuotes = 1089, CSSPropertyResize = 1090, CSSPropertyRight = 1091, - CSSPropertyScrollbar3dlightColor = 1092, - CSSPropertyScrollbarArrowColor = 1093, - CSSPropertyScrollbarDarkshadowColor = 1094, - CSSPropertyScrollbarFaceColor = 1095, - CSSPropertyScrollbarHighlightColor = 1096, - CSSPropertyScrollbarShadowColor = 1097, - CSSPropertyScrollbarTrackColor = 1098, - CSSPropertySize = 1099, - CSSPropertySrc = 1100, - CSSPropertyTableLayout = 1101, - CSSPropertyTextAlign = 1102, - CSSPropertyTextDecoration = 1103, - CSSPropertyTextIndent = 1104, - CSSPropertyTextLineThrough = 1105, - CSSPropertyTextLineThroughColor = 1106, - CSSPropertyTextLineThroughMode = 1107, - CSSPropertyTextLineThroughStyle = 1108, - CSSPropertyTextLineThroughWidth = 1109, - CSSPropertyTextOverflow = 1110, - CSSPropertyTextOverline = 1111, - CSSPropertyTextOverlineColor = 1112, - CSSPropertyTextOverlineMode = 1113, - CSSPropertyTextOverlineStyle = 1114, - CSSPropertyTextOverlineWidth = 1115, - CSSPropertyTextShadow = 1116, - CSSPropertyTextTransform = 1117, - CSSPropertyTextUnderline = 1118, - CSSPropertyTextUnderlineColor = 1119, - CSSPropertyTextUnderlineMode = 1120, - CSSPropertyTextUnderlineStyle = 1121, - CSSPropertyTextUnderlineWidth = 1122, - CSSPropertyTop = 1123, - CSSPropertyUnicodeBidi = 1124, - CSSPropertyUnicodeRange = 1125, - CSSPropertyVerticalAlign = 1126, - CSSPropertyVisibility = 1127, - CSSPropertyWhiteSpace = 1128, - CSSPropertyWidows = 1129, - CSSPropertyWidth = 1130, - CSSPropertyWordBreak = 1131, - CSSPropertyWordSpacing = 1132, - CSSPropertyWordWrap = 1133, - CSSPropertyZIndex = 1134, - CSSPropertyZoom = 1135, - CSSPropertyWebkitAnimation = 1136, - CSSPropertyWebkitAnimationDelay = 1137, - CSSPropertyWebkitAnimationDirection = 1138, - CSSPropertyWebkitAnimationDuration = 1139, - CSSPropertyWebkitAnimationIterationCount = 1140, - CSSPropertyWebkitAnimationName = 1141, - CSSPropertyWebkitAnimationPlayState = 1142, - CSSPropertyWebkitAnimationTimingFunction = 1143, - CSSPropertyWebkitAppearance = 1144, - CSSPropertyWebkitBackgroundClip = 1145, - CSSPropertyWebkitBackgroundComposite = 1146, - CSSPropertyWebkitBackgroundOrigin = 1147, - CSSPropertyWebkitBackgroundSize = 1148, - CSSPropertyWebkitBinding = 1149, - CSSPropertyWebkitBorderBottomLeftRadius = 1150, - CSSPropertyWebkitBorderBottomRightRadius = 1151, - CSSPropertyWebkitBorderFit = 1152, - CSSPropertyWebkitBorderHorizontalSpacing = 1153, - CSSPropertyWebkitBorderImage = 1154, - CSSPropertyWebkitBorderRadius = 1155, - CSSPropertyWebkitBorderTopLeftRadius = 1156, - CSSPropertyWebkitBorderTopRightRadius = 1157, - CSSPropertyWebkitBorderVerticalSpacing = 1158, - CSSPropertyWebkitBoxAlign = 1159, - CSSPropertyWebkitBoxDirection = 1160, - CSSPropertyWebkitBoxFlex = 1161, - CSSPropertyWebkitBoxFlexGroup = 1162, - CSSPropertyWebkitBoxLines = 1163, - CSSPropertyWebkitBoxOrdinalGroup = 1164, - CSSPropertyWebkitBoxOrient = 1165, - CSSPropertyWebkitBoxPack = 1166, - CSSPropertyWebkitBoxReflect = 1167, - CSSPropertyWebkitBoxShadow = 1168, - CSSPropertyWebkitBoxSizing = 1169, - CSSPropertyWebkitColumnBreakAfter = 1170, - CSSPropertyWebkitColumnBreakBefore = 1171, - CSSPropertyWebkitColumnBreakInside = 1172, - CSSPropertyWebkitColumnCount = 1173, - CSSPropertyWebkitColumnGap = 1174, - CSSPropertyWebkitColumnRule = 1175, - CSSPropertyWebkitColumnRuleColor = 1176, - CSSPropertyWebkitColumnRuleStyle = 1177, - CSSPropertyWebkitColumnRuleWidth = 1178, - CSSPropertyWebkitColumnWidth = 1179, - CSSPropertyWebkitColumns = 1180, - CSSPropertyWebkitFontSizeDelta = 1181, - CSSPropertyWebkitHighlight = 1182, - CSSPropertyWebkitLineBreak = 1183, - CSSPropertyWebkitLineClamp = 1184, - CSSPropertyWebkitMarginBottomCollapse = 1185, - CSSPropertyWebkitMarginCollapse = 1186, - CSSPropertyWebkitMarginStart = 1187, - CSSPropertyWebkitMarginTopCollapse = 1188, - CSSPropertyWebkitMarquee = 1189, - CSSPropertyWebkitMarqueeDirection = 1190, - CSSPropertyWebkitMarqueeIncrement = 1191, - CSSPropertyWebkitMarqueeRepetition = 1192, - CSSPropertyWebkitMarqueeSpeed = 1193, - CSSPropertyWebkitMarqueeStyle = 1194, - CSSPropertyWebkitMask = 1195, - CSSPropertyWebkitMaskAttachment = 1196, - CSSPropertyWebkitMaskBoxImage = 1197, - CSSPropertyWebkitMaskClip = 1198, - CSSPropertyWebkitMaskComposite = 1199, - CSSPropertyWebkitMaskImage = 1200, - CSSPropertyWebkitMaskOrigin = 1201, - CSSPropertyWebkitMaskPosition = 1202, - CSSPropertyWebkitMaskPositionX = 1203, - CSSPropertyWebkitMaskPositionY = 1204, - CSSPropertyWebkitMaskRepeat = 1205, - CSSPropertyWebkitMaskSize = 1206, - CSSPropertyWebkitMatchNearestMailBlockquoteColor = 1207, - CSSPropertyWebkitNbspMode = 1208, - CSSPropertyWebkitPaddingStart = 1209, - CSSPropertyWebkitRtlOrdering = 1210, - CSSPropertyWebkitTextDecorationsInEffect = 1211, - CSSPropertyWebkitTextFillColor = 1212, - CSSPropertyWebkitTextSecurity = 1213, - CSSPropertyWebkitTextSizeAdjust = 1214, - CSSPropertyWebkitTextStroke = 1215, - CSSPropertyWebkitTextStrokeColor = 1216, - CSSPropertyWebkitTextStrokeWidth = 1217, - CSSPropertyWebkitTransform = 1218, - CSSPropertyWebkitTransformOrigin = 1219, - CSSPropertyWebkitTransformOriginX = 1220, - CSSPropertyWebkitTransformOriginY = 1221, - CSSPropertyWebkitTransition = 1222, - CSSPropertyWebkitTransitionDelay = 1223, - CSSPropertyWebkitTransitionDuration = 1224, - CSSPropertyWebkitTransitionProperty = 1225, - CSSPropertyWebkitTransitionTimingFunction = 1226, - CSSPropertyWebkitUserDrag = 1227, - CSSPropertyWebkitUserModify = 1228, - CSSPropertyWebkitUserSelect = 1229, - CSSPropertyWebkitVariableDeclarationBlock = 1230, - CSSPropertyClipPath = 1231, - CSSPropertyClipRule = 1232, - CSSPropertyMask = 1233, - CSSPropertyEnableBackground = 1234, - CSSPropertyFilter = 1235, - CSSPropertyFloodColor = 1236, - CSSPropertyFloodOpacity = 1237, - CSSPropertyLightingColor = 1238, - CSSPropertyStopColor = 1239, - CSSPropertyStopOpacity = 1240, - CSSPropertyColorInterpolation = 1241, - CSSPropertyColorInterpolationFilters = 1242, - CSSPropertyColorProfile = 1243, - CSSPropertyColorRendering = 1244, - CSSPropertyFill = 1245, - CSSPropertyFillOpacity = 1246, - CSSPropertyFillRule = 1247, - CSSPropertyImageRendering = 1248, - CSSPropertyMarker = 1249, - CSSPropertyMarkerEnd = 1250, - CSSPropertyMarkerMid = 1251, - CSSPropertyMarkerStart = 1252, - CSSPropertyShapeRendering = 1253, - CSSPropertyStroke = 1254, - CSSPropertyStrokeDasharray = 1255, - CSSPropertyStrokeDashoffset = 1256, - CSSPropertyStrokeLinecap = 1257, - CSSPropertyStrokeLinejoin = 1258, - CSSPropertyStrokeMiterlimit = 1259, - CSSPropertyStrokeOpacity = 1260, - CSSPropertyStrokeWidth = 1261, - CSSPropertyTextRendering = 1262, - CSSPropertyAlignmentBaseline = 1263, - CSSPropertyBaselineShift = 1264, - CSSPropertyDominantBaseline = 1265, - CSSPropertyGlyphOrientationHorizontal = 1266, - CSSPropertyGlyphOrientationVertical = 1267, - CSSPropertyKerning = 1268, - CSSPropertyTextAnchor = 1269, - CSSPropertyWritingMode = 1270, + CSSPropertySize = 1092, + CSSPropertySrc = 1093, + CSSPropertyTableLayout = 1094, + CSSPropertyTextAlign = 1095, + CSSPropertyTextDecoration = 1096, + CSSPropertyTextIndent = 1097, + CSSPropertyTextLineThrough = 1098, + CSSPropertyTextLineThroughColor = 1099, + CSSPropertyTextLineThroughMode = 1100, + CSSPropertyTextLineThroughStyle = 1101, + CSSPropertyTextLineThroughWidth = 1102, + CSSPropertyTextOverflow = 1103, + CSSPropertyTextOverline = 1104, + CSSPropertyTextOverlineColor = 1105, + CSSPropertyTextOverlineMode = 1106, + CSSPropertyTextOverlineStyle = 1107, + CSSPropertyTextOverlineWidth = 1108, + CSSPropertyTextShadow = 1109, + CSSPropertyTextTransform = 1110, + CSSPropertyTextUnderline = 1111, + CSSPropertyTextUnderlineColor = 1112, + CSSPropertyTextUnderlineMode = 1113, + CSSPropertyTextUnderlineStyle = 1114, + CSSPropertyTextUnderlineWidth = 1115, + CSSPropertyTop = 1116, + CSSPropertyUnicodeBidi = 1117, + CSSPropertyUnicodeRange = 1118, + CSSPropertyVerticalAlign = 1119, + CSSPropertyVisibility = 1120, + CSSPropertyWhiteSpace = 1121, + CSSPropertyWidows = 1122, + CSSPropertyWidth = 1123, + CSSPropertyWordBreak = 1124, + CSSPropertyWordSpacing = 1125, + CSSPropertyWordWrap = 1126, + CSSPropertyZIndex = 1127, + CSSPropertyZoom = 1128, + CSSPropertyWebkitAnimation = 1129, + CSSPropertyWebkitAnimationDelay = 1130, + CSSPropertyWebkitAnimationDirection = 1131, + CSSPropertyWebkitAnimationDuration = 1132, + CSSPropertyWebkitAnimationIterationCount = 1133, + CSSPropertyWebkitAnimationName = 1134, + CSSPropertyWebkitAnimationTimingFunction = 1135, + CSSPropertyWebkitAppearance = 1136, + CSSPropertyWebkitBackfaceVisibility = 1137, + CSSPropertyWebkitBackgroundClip = 1138, + CSSPropertyWebkitBackgroundComposite = 1139, + CSSPropertyWebkitBackgroundOrigin = 1140, + CSSPropertyWebkitBackgroundSize = 1141, + CSSPropertyWebkitBinding = 1142, + CSSPropertyWebkitBorderBottomLeftRadius = 1143, + CSSPropertyWebkitBorderBottomRightRadius = 1144, + CSSPropertyWebkitBorderFit = 1145, + CSSPropertyWebkitBorderHorizontalSpacing = 1146, + CSSPropertyWebkitBorderImage = 1147, + CSSPropertyWebkitBorderRadius = 1148, + CSSPropertyWebkitBorderTopLeftRadius = 1149, + CSSPropertyWebkitBorderTopRightRadius = 1150, + CSSPropertyWebkitBorderVerticalSpacing = 1151, + CSSPropertyWebkitBoxAlign = 1152, + CSSPropertyWebkitBoxDirection = 1153, + CSSPropertyWebkitBoxFlex = 1154, + CSSPropertyWebkitBoxFlexGroup = 1155, + CSSPropertyWebkitBoxLines = 1156, + CSSPropertyWebkitBoxOrdinalGroup = 1157, + CSSPropertyWebkitBoxOrient = 1158, + CSSPropertyWebkitBoxPack = 1159, + CSSPropertyWebkitBoxReflect = 1160, + CSSPropertyWebkitBoxShadow = 1161, + CSSPropertyWebkitBoxSizing = 1162, + CSSPropertyWebkitColumnBreakAfter = 1163, + CSSPropertyWebkitColumnBreakBefore = 1164, + CSSPropertyWebkitColumnBreakInside = 1165, + CSSPropertyWebkitColumnCount = 1166, + CSSPropertyWebkitColumnGap = 1167, + CSSPropertyWebkitColumnRule = 1168, + CSSPropertyWebkitColumnRuleColor = 1169, + CSSPropertyWebkitColumnRuleStyle = 1170, + CSSPropertyWebkitColumnRuleWidth = 1171, + CSSPropertyWebkitColumnWidth = 1172, + CSSPropertyWebkitColumns = 1173, + CSSPropertyWebkitFontSizeDelta = 1174, + CSSPropertyWebkitHighlight = 1175, + CSSPropertyWebkitLineBreak = 1176, + CSSPropertyWebkitLineClamp = 1177, + CSSPropertyWebkitMarginBottomCollapse = 1178, + CSSPropertyWebkitMarginCollapse = 1179, + CSSPropertyWebkitMarginStart = 1180, + CSSPropertyWebkitMarginTopCollapse = 1181, + CSSPropertyWebkitMarquee = 1182, + CSSPropertyWebkitMarqueeDirection = 1183, + CSSPropertyWebkitMarqueeIncrement = 1184, + CSSPropertyWebkitMarqueeRepetition = 1185, + CSSPropertyWebkitMarqueeSpeed = 1186, + CSSPropertyWebkitMarqueeStyle = 1187, + CSSPropertyWebkitMask = 1188, + CSSPropertyWebkitMaskAttachment = 1189, + CSSPropertyWebkitMaskBoxImage = 1190, + CSSPropertyWebkitMaskClip = 1191, + CSSPropertyWebkitMaskComposite = 1192, + CSSPropertyWebkitMaskImage = 1193, + CSSPropertyWebkitMaskOrigin = 1194, + CSSPropertyWebkitMaskPosition = 1195, + CSSPropertyWebkitMaskPositionX = 1196, + CSSPropertyWebkitMaskPositionY = 1197, + CSSPropertyWebkitMaskRepeat = 1198, + CSSPropertyWebkitMaskSize = 1199, + CSSPropertyWebkitMatchNearestMailBlockquoteColor = 1200, + CSSPropertyWebkitNbspMode = 1201, + CSSPropertyWebkitPaddingStart = 1202, + CSSPropertyWebkitPerspective = 1203, + CSSPropertyWebkitPerspectiveOrigin = 1204, + CSSPropertyWebkitPerspectiveOriginX = 1205, + CSSPropertyWebkitPerspectiveOriginY = 1206, + CSSPropertyWebkitRtlOrdering = 1207, + CSSPropertyWebkitTextDecorationsInEffect = 1208, + CSSPropertyWebkitTextFillColor = 1209, + CSSPropertyWebkitTextSecurity = 1210, + CSSPropertyWebkitTextSizeAdjust = 1211, + CSSPropertyWebkitTextStroke = 1212, + CSSPropertyWebkitTextStrokeColor = 1213, + CSSPropertyWebkitTextStrokeWidth = 1214, + CSSPropertyWebkitTransform = 1215, + CSSPropertyWebkitTransformOrigin = 1216, + CSSPropertyWebkitTransformOriginX = 1217, + CSSPropertyWebkitTransformOriginY = 1218, + CSSPropertyWebkitTransformOriginZ = 1219, + CSSPropertyWebkitTransformStyle = 1220, + CSSPropertyWebkitTransition = 1221, + CSSPropertyWebkitTransitionDelay = 1222, + CSSPropertyWebkitTransitionDuration = 1223, + CSSPropertyWebkitTransitionProperty = 1224, + CSSPropertyWebkitTransitionTimingFunction = 1225, + CSSPropertyWebkitUserDrag = 1226, + CSSPropertyWebkitUserModify = 1227, + CSSPropertyWebkitUserSelect = 1228, + CSSPropertyWebkitVariableDeclarationBlock = 1229, + CSSPropertyClipPath = 1230, + CSSPropertyClipRule = 1231, + CSSPropertyMask = 1232, + CSSPropertyEnableBackground = 1233, + CSSPropertyFilter = 1234, + CSSPropertyFloodColor = 1235, + CSSPropertyFloodOpacity = 1236, + CSSPropertyLightingColor = 1237, + CSSPropertyStopColor = 1238, + CSSPropertyStopOpacity = 1239, + CSSPropertyColorInterpolation = 1240, + CSSPropertyColorInterpolationFilters = 1241, + CSSPropertyColorProfile = 1242, + CSSPropertyColorRendering = 1243, + CSSPropertyFill = 1244, + CSSPropertyFillOpacity = 1245, + CSSPropertyFillRule = 1246, + CSSPropertyImageRendering = 1247, + CSSPropertyMarker = 1248, + CSSPropertyMarkerEnd = 1249, + CSSPropertyMarkerMid = 1250, + CSSPropertyMarkerStart = 1251, + CSSPropertyShapeRendering = 1252, + CSSPropertyStroke = 1253, + CSSPropertyStrokeDasharray = 1254, + CSSPropertyStrokeDashoffset = 1255, + CSSPropertyStrokeLinecap = 1256, + CSSPropertyStrokeLinejoin = 1257, + CSSPropertyStrokeMiterlimit = 1258, + CSSPropertyStrokeOpacity = 1259, + CSSPropertyStrokeWidth = 1260, + CSSPropertyTextRendering = 1261, + CSSPropertyAlignmentBaseline = 1262, + CSSPropertyBaselineShift = 1263, + CSSPropertyDominantBaseline = 1264, + CSSPropertyGlyphOrientationHorizontal = 1265, + CSSPropertyGlyphOrientationVertical = 1266, + CSSPropertyKerning = 1267, + CSSPropertyTextAnchor = 1268, + CSSPropertyWritingMode = 1269, }; const int firstCSSProperty = 1001; -const int numCSSProperties = 270; +const int numCSSProperties = 269; const size_t maxCSSPropertyNameLength = 43; const char* getPropertyName(CSSPropertyID); diff --git a/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.c b/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.c index 5ff0858c64..e84ca9e05b 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.c +++ b/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.c @@ -38,7 +38,7 @@ struct css_value { const char* name; int id; }; -/* maximum key range = 5296, duplicates = 0 */ +/* maximum key range = 8752, duplicates = 0 */ #ifdef __GNUC__ __inline @@ -52,32 +52,32 @@ hash_val (register const char *str, register unsigned int len) { static const unsigned short asso_values[] = { - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 90, 37, 5296, 5296, 0, - 55, 50, 40, 35, 30, 25, 20, 5, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5, 200, 15, - 285, 0, 1, 1005, 565, 35, 226, 850, 10, 20, - 30, 10, 45, 661, 325, 5, 80, 305, 805, 32, - 511, 256, 790, 0, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, 5296, - 5296, 5296, 5296, 5296, 5296, 5296, 5296 + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 970, 27, 8752, 8752, 0, + 55, 5, 50, 40, 35, 30, 25, 20, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 5, 200, 15, + 590, 0, 515, 251, 21, 35, 1, 905, 10, 20, + 30, 10, 45, 651, 160, 5, 80, 145, 960, 136, + 920, 971, 105, 0, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, + 8752, 8752, 8752, 8752, 8752, 8752, 8752 }; register int hval = 0; @@ -188,1402 +188,1537 @@ findValue (register const char *str, register unsigned int len) { enum { - TOTAL_KEYWORDS = 531, + TOTAL_KEYWORDS = 537, MIN_WORD_LENGTH = 2, MAX_WORD_LENGTH = 30, MIN_HASH_VALUE = 0, - MAX_HASH_VALUE = 5295 + MAX_HASH_VALUE = 8751 }; static const struct css_value wordlist_value[] = { #line 40 "CSSValueKeywords.gperf" {"100", CSSValue100}, -#line 48 "CSSValueKeywords.gperf" - {"900", CSSValue900}, +#line 42 "CSSValueKeywords.gperf" + {"300", CSSValue300}, #line 287 "CSSValueKeywords.gperf" {"end", CSSValueEnd}, -#line 539 "CSSValueKeywords.gperf" +#line 545 "CSSValueKeywords.gperf" {"lr", CSSValueLr}, +#line 48 "CSSValueKeywords.gperf" + {"900", CSSValue900}, +#line 256 "CSSValueKeywords.gperf" + {"hide", CSSValueHide}, #line 47 "CSSValueKeywords.gperf" {"800", CSSValue800}, +#line 369 "CSSValueKeywords.gperf" + {"lines", CSSValueLines}, #line 46 "CSSValueKeywords.gperf" {"700", CSSValue700}, #line 45 "CSSValueKeywords.gperf" {"600", CSSValue600}, +#line 209 "CSSValueKeywords.gperf" + {"alias", CSSValueAlias}, #line 44 "CSSValueKeywords.gperf" {"500", CSSValue500}, -#line 43 "CSSValueKeywords.gperf" - {"400", CSSValue400}, +#line 81 "CSSValueKeywords.gperf" + {"lime", CSSValueLime}, #line 34 "CSSValueKeywords.gperf" {"all", CSSValueAll}, -#line 207 "CSSValueKeywords.gperf" - {"cell", CSSValueCell}, -#line 69 "CSSValueKeywords.gperf" - {"serif", CSSValueSerif}, -#line 42 "CSSValueKeywords.gperf" - {"300", CSSValue300}, -#line 273 "CSSValueKeywords.gperf" - {"pre", CSSValuePre}, -#line 260 "CSSValueKeywords.gperf" - {"level", CSSValueLevel}, +#line 164 "CSSValueKeywords.gperf" + {"circle", CSSValueCircle}, +#line 43 "CSSValueKeywords.gperf" + {"400", CSSValue400}, +#line 463 "CSSValueKeywords.gperf" + {"linen", CSSValueLinen}, #line 41 "CSSValueKeywords.gperf" {"200", CSSValue200}, -#line 473 "CSSValueKeywords.gperf" +#line 479 "CSSValueKeywords.gperf" {"oldlace", CSSValueOldlace}, #line 252 "CSSValueKeywords.gperf" {"cross", CSSValueCross}, -#line 394 "CSSValueKeywords.gperf" +#line 400 "CSSValueKeywords.gperf" {"coral", CSSValueCoral}, +#line 312 "CSSValueKeywords.gperf" + {"clip", CSSValueClip}, #line 13 "CSSValueKeywords.gperf" {"none", CSSValueNone}, -#line 499 "CSSValueKeywords.gperf" - {"snow", CSSValueSnow}, -#line 541 "CSSValueKeywords.gperf" +#line 403 "CSSValueKeywords.gperf" + {"crimson", CSSValueCrimson}, +#line 547 "CSSValueKeywords.gperf" {"tb", CSSValueTb}, -#line 205 "CSSValueKeywords.gperf" - {"move", CSSValueMove}, -#line 300 "CSSValueKeywords.gperf" - {"slow", CSSValueSlow}, #line 251 "CSSValueKeywords.gperf" {"crop", CSSValueCrop}, #line 36 "CSSValueKeywords.gperf" {"normal", CSSValueNormal}, -#line 279 "CSSValueKeywords.gperf" - {"show", CSSValueShow}, #line 183 "CSSValueKeywords.gperf" {"inline", CSSValueInline}, #line 176 "CSSValueKeywords.gperf" {"armenian", CSSValueArmenian}, +#line 367 "CSSValueKeywords.gperf" + {"logical", CSSValueLogical}, #line 241 "CSSValueKeywords.gperf" {"collapse", CSSValueCollapse}, -#line 308 "CSSValueKeywords.gperf" - {"element", CSSValueElement}, -#line 507 "CSSValueKeywords.gperf" - {"wheat", CSSValueWheat}, +#line 282 "CSSValueKeywords.gperf" + {"thin", CSSValueThin}, #line 73 "CSSValueKeywords.gperf" {"monospace", CSSValueMonospace}, +#line 235 "CSSValueKeywords.gperf" + {"ltr", CSSValueLtr}, #line 313 "CSSValueKeywords.gperf" {"ellipsis", CSSValueEllipsis}, +#line 12 "CSSValueKeywords.gperf" + {"initial", CSSValueInitial}, +#line 215 "CSSValueKeywords.gperf" + {"e-resize", CSSValueEResize}, +#line 546 "CSSValueKeywords.gperf" + {"rl", CSSValueRl}, +#line 221 "CSSValueKeywords.gperf" + {"s-resize", CSSValueSResize}, +#line 375 "CSSValueKeywords.gperf" + {"linear", CSSValueLinear}, +#line 505 "CSSValueKeywords.gperf" + {"snow", CSSValueSnow}, +#line 205 "CSSValueKeywords.gperf" + {"move", CSSValueMove}, #line 15 "CSSValueKeywords.gperf" {"inset", CSSValueInset}, -#line 393 "CSSValueKeywords.gperf" +#line 300 "CSSValueKeywords.gperf" + {"slow", CSSValueSlow}, +#line 218 "CSSValueKeywords.gperf" + {"n-resize", CSSValueNResize}, +#line 509 "CSSValueKeywords.gperf" + {"thistle", CSSValueThistle}, +#line 455 "CSSValueKeywords.gperf" + {"lightsalmon", CSSValueLightsalmon}, +#line 399 "CSSValueKeywords.gperf" {"chocolate", CSSValueChocolate}, -#line 274 "CSSValueKeywords.gperf" - {"pre-line", CSSValuePreLine}, +#line 279 "CSSValueKeywords.gperf" + {"show", CSSValueShow}, +#line 257 "CSSValueKeywords.gperf" + {"higher", CSSValueHigher}, +#line 520 "CSSValueKeywords.gperf" + {"srgb", CSSValueSrgb}, #line 187 "CSSValueKeywords.gperf" {"compact", CSSValueCompact}, -#line 522 "CSSValueKeywords.gperf" - {"bevel", CSSValueBevel}, -#line 504 "CSSValueKeywords.gperf" +#line 309 "CSSValueKeywords.gperf" + {"ignore", CSSValueIgnore}, +#line 510 "CSSValueKeywords.gperf" {"tomato", CSSValueTomato}, -#line 365 "CSSValueKeywords.gperf" - {"lines", CSSValueLines}, +#line 90 "CSSValueKeywords.gperf" + {"white", CSSValueWhite}, #line 51 "CSSValueKeywords.gperf" {"small", CSSValueSmall}, -#line 379 "CSSValueKeywords.gperf" - {"fill", CSSValueFill}, -#line 359 "CSSValueKeywords.gperf" +#line 362 "CSSValueKeywords.gperf" {"content", CSSValueContent}, -#line 209 "CSSValueKeywords.gperf" - {"alias", CSSValueAlias}, -#line 246 "CSSValueKeywords.gperf" - {"below", CSSValueBelow}, -#line 317 "CSSValueKeywords.gperf" - {"wave", CSSValueWave}, -#line 81 "CSSValueKeywords.gperf" - {"lime", CSSValueLime}, -#line 164 "CSSValueKeywords.gperf" - {"circle", CSSValueCircle}, +#line 285 "CSSValueKeywords.gperf" + {"stretch", CSSValueStretch}, #line 82 "CSSValueKeywords.gperf" {"maroon", CSSValueMaroon}, -#line 457 "CSSValueKeywords.gperf" - {"linen", CSSValueLinen}, -#line 368 "CSSValueKeywords.gperf" +#line 293 "CSSValueKeywords.gperf" + {"single", CSSValueSingle}, +#line 374 "CSSValueKeywords.gperf" {"ease", CSSValueEase}, -#line 490 "CSSValueKeywords.gperf" +#line 155 "CSSValueKeywords.gperf" + {"right", CSSValueRight}, +#line 496 "CSSValueKeywords.gperf" {"salmon", CSSValueSalmon}, -#line 502 "CSSValueKeywords.gperf" +#line 508 "CSSValueKeywords.gperf" {"tan", CSSValueTan}, -#line 89 "CSSValueKeywords.gperf" - {"teal", CSSValueTeal}, -#line 494 "CSSValueKeywords.gperf" - {"sienna", CSSValueSienna}, -#line 348 "CSSValueKeywords.gperf" +#line 544 "CSSValueKeywords.gperf" + {"tb-rl", CSSValueTbRl}, +#line 39 "CSSValueKeywords.gperf" + {"lighter", CSSValueLighter}, +#line 202 "CSSValueKeywords.gperf" + {"crosshair", CSSValueCrosshair}, +#line 59 "CSSValueKeywords.gperf" + {"wider", CSSValueWider}, +#line 351 "CSSValueKeywords.gperf" {"caret", CSSValueCaret}, #line 189 "CSSValueKeywords.gperf" {"table", CSSValueTable}, -#line 312 "CSSValueKeywords.gperf" - {"clip", CSSValueClip}, -#line 397 "CSSValueKeywords.gperf" - {"crimson", CSSValueCrimson}, -#line 389 "CSSValueKeywords.gperf" +#line 332 "CSSValueKeywords.gperf" + {"listitem", CSSValueListitem}, +#line 475 "CSSValueKeywords.gperf" + {"mintcream", CSSValueMintcream}, +#line 222 "CSSValueKeywords.gperf" + {"w-resize", CSSValueWResize}, +#line 542 "CSSValueKeywords.gperf" + {"lr-tb", CSSValueLrTb}, +#line 179 "CSSValueKeywords.gperf" + {"hiragana", CSSValueHiragana}, +#line 236 "CSSValueKeywords.gperf" + {"rtl", CSSValueRtl}, +#line 527 "CSSValueKeywords.gperf" + {"miter", CSSValueMiter}, +#line 448 "CSSValueKeywords.gperf" + {"lightcoral", CSSValueLightcoral}, +#line 440 "CSSValueKeywords.gperf" + {"indigo", CSSValueIndigo}, +#line 243 "CSSValueKeywords.gperf" + {"absolute", CSSValueAbsolute}, +#line 289 "CSSValueKeywords.gperf" + {"horizontal", CSSValueHorizontal}, +#line 404 "CSSValueKeywords.gperf" + {"cyan", CSSValueCyan}, +#line 11 "CSSValueKeywords.gperf" + {"inherit", CSSValueInherit}, +#line 464 "CSSValueKeywords.gperf" + {"magenta", CSSValueMagenta}, +#line 516 "CSSValueKeywords.gperf" + {"nonzero", CSSValueNonzero}, +#line 204 "CSSValueKeywords.gperf" + {"pointer", CSSValuePointer}, +#line 283 "CSSValueKeywords.gperf" + {"underline", CSSValueUnderline}, +#line 130 "CSSValueKeywords.gperf" + {"no-repeat", CSSValueNoRepeat}, +#line 387 "CSSValueKeywords.gperf" + {"aliceblue", CSSValueAliceblue}, +#line 112 "CSSValueKeywords.gperf" + {"match", CSSValueMatch}, +#line 325 "CSSValueKeywords.gperf" + {"radio", CSSValueRadio}, +#line 249 "CSSValueKeywords.gperf" + {"both", CSSValueBoth}, +#line 17 "CSSValueKeywords.gperf" + {"ridge", CSSValueRidge}, +#line 57 "CSSValueKeywords.gperf" + {"smaller", CSSValueSmaller}, +#line 395 "CSSValueKeywords.gperf" {"brown", CSSValueBrown}, -#line 235 "CSSValueKeywords.gperf" - {"ltr", CSSValueLtr}, +#line 230 "CSSValueKeywords.gperf" + {"wait", CSSValueWait}, +#line 258 "CSSValueKeywords.gperf" + {"invert", CSSValueInvert}, +#line 540 "CSSValueKeywords.gperf" + {"no-change", CSSValueNoChange}, +#line 32 "CSSValueKeywords.gperf" + {"italic", CSSValueItalic}, +#line 224 "CSSValueKeywords.gperf" + {"ns-resize", CSSValueNsResize}, +#line 304 "CSSValueKeywords.gperf" + {"alternate", CSSValueAlternate}, +#line 272 "CSSValueKeywords.gperf" + {"portrait", CSSValuePortrait}, +#line 105 "CSSValueKeywords.gperf" + {"highlight", CSSValueHighlight}, +#line 53 "CSSValueKeywords.gperf" + {"large", CSSValueLarge}, +#line 310 "CSSValueKeywords.gperf" + {"intrinsic", CSSValueIntrinsic}, +#line 317 "CSSValueKeywords.gperf" + {"wave", CSSValueWave}, +#line 501 "CSSValueKeywords.gperf" + {"skyblue", CSSValueSkyblue}, +#line 302 "CSSValueKeywords.gperf" + {"infinite", CSSValueInfinite}, +#line 280 "CSSValueKeywords.gperf" + {"static", CSSValueStatic}, +#line 462 "CSSValueKeywords.gperf" + {"limegreen", CSSValueLimegreen}, +#line 543 "CSSValueKeywords.gperf" + {"rl-tb", CSSValueRlTb}, +#line 447 "CSSValueKeywords.gperf" + {"lightblue", CSSValueLightblue}, +#line 85 "CSSValueKeywords.gperf" + {"orange", CSSValueOrange}, +#line 151 "CSSValueKeywords.gperf" + {"bottom", CSSValueBottom}, +#line 210 "CSSValueKeywords.gperf" + {"progress", CSSValueProgress}, +#line 318 "CSSValueKeywords.gperf" + {"continuous", CSSValueContinuous}, +#line 385 "CSSValueKeywords.gperf" + {"fill", CSSValueFill}, +#line 144 "CSSValueKeywords.gperf" + {"baseline", CSSValueBaseline}, +#line 538 "CSSValueKeywords.gperf" + {"mathematical", CSSValueMathematical}, +#line 207 "CSSValueKeywords.gperf" + {"cell", CSSValueCell}, +#line 273 "CSSValueKeywords.gperf" + {"pre", CSSValuePre}, +#line 452 "CSSValueKeywords.gperf" + {"lightgreen", CSSValueLightgreen}, +#line 460 "CSSValueKeywords.gperf" + {"lightsteelblue", CSSValueLightsteelblue}, +#line 456 "CSSValueKeywords.gperf" + {"lightseagreen", CSSValueLightseagreen}, +#line 500 "CSSValueKeywords.gperf" + {"sienna", CSSValueSienna}, +#line 286 "CSSValueKeywords.gperf" + {"start", CSSValueStart}, +#line 231 "CSSValueKeywords.gperf" + {"help", CSSValueHelp}, +#line 303 "CSSValueKeywords.gperf" + {"slide", CSSValueSlide}, +#line 145 "CSSValueKeywords.gperf" + {"middle", CSSValueMiddle}, +#line 58 "CSSValueKeywords.gperf" + {"larger", CSSValueLarger}, #line 277 "CSSValueKeywords.gperf" {"scroll", CSSValueScroll}, -#line 87 "CSSValueKeywords.gperf" - {"red", CSSValueRed}, -#line 91 "CSSValueKeywords.gperf" - {"yellow", CSSValueYellow}, #line 253 "CSSValueKeywords.gperf" {"embed", CSSValueEmbed}, -#line 297 "CSSValueKeywords.gperf" - {"ahead", CSSValueAhead}, -#line 536 "CSSValueKeywords.gperf" - {"lr-tb", CSSValueLrTb}, +#line 92 "CSSValueKeywords.gperf" + {"transparent", CSSValueTransparent}, +#line 14 "CSSValueKeywords.gperf" + {"hidden", CSSValueHidden}, +#line 397 "CSSValueKeywords.gperf" + {"cadetblue", CSSValueCadetblue}, +#line 478 "CSSValueKeywords.gperf" + {"navajowhite", CSSValueNavajowhite}, +#line 502 "CSSValueKeywords.gperf" + {"slateblue", CSSValueSlateblue}, +#line 308 "CSSValueKeywords.gperf" + {"element", CSSValueElement}, +#line 260 "CSSValueKeywords.gperf" + {"level", CSSValueLevel}, +#line 87 "CSSValueKeywords.gperf" + {"red", CSSValueRed}, +#line 494 "CSSValueKeywords.gperf" + {"royalblue", CSSValueRoyalblue}, +#line 163 "CSSValueKeywords.gperf" + {"disc", CSSValueDisc}, +#line 433 "CSSValueKeywords.gperf" + {"ghostwhite", CSSValueGhostwhite}, #line 25 "CSSValueKeywords.gperf" {"menu", CSSValueMenu}, -#line 540 "CSSValueKeywords.gperf" - {"rl", CSSValueRl}, -#line 483 "CSSValueKeywords.gperf" +#line 21 "CSSValueKeywords.gperf" + {"solid", CSSValueSolid}, +#line 24 "CSSValueKeywords.gperf" + {"icon", CSSValueIcon}, +#line 60 "CSSValueKeywords.gperf" + {"narrower", CSSValueNarrower}, +#line 484 "CSSValueKeywords.gperf" + {"palegreen", CSSValuePalegreen}, +#line 489 "CSSValueKeywords.gperf" {"peru", CSSValuePeru}, -#line 301 "CSSValueKeywords.gperf" - {"fast", CSSValueFast}, #line 131 "CSSValueKeywords.gperf" {"clear", CSSValueClear}, -#line 282 "CSSValueKeywords.gperf" - {"thin", CSSValueThin}, -#line 90 "CSSValueKeywords.gperf" - {"white", CSSValueWhite}, #line 52 "CSSValueKeywords.gperf" {"medium", CSSValueMedium}, -#line 21 "CSSValueKeywords.gperf" - {"solid", CSSValueSolid}, -#line 24 "CSSValueKeywords.gperf" - {"icon", CSSValueIcon}, -#line 12 "CSSValueKeywords.gperf" - {"initial", CSSValueInitial}, -#line 245 "CSSValueKeywords.gperf" - {"avoid", CSSValueAvoid}, -#line 35 "CSSValueKeywords.gperf" - {"small-caps", CSSValueSmallCaps}, -#line 229 "CSSValueKeywords.gperf" - {"text", CSSValueText}, -#line 116 "CSSValueKeywords.gperf" - {"threedface", CSSValueThreedface}, -#line 197 "CSSValueKeywords.gperf" - {"table-cell", CSSValueTableCell}, -#line 156 "CSSValueKeywords.gperf" - {"center", CSSValueCenter}, -#line 370 "CSSValueKeywords.gperf" - {"ease-in", CSSValueEaseIn}, -#line 503 "CSSValueKeywords.gperf" - {"thistle", CSSValueThistle}, -#line 471 "CSSValueKeywords.gperf" +#line 477 "CSSValueKeywords.gperf" {"moccasin", CSSValueMoccasin}, -#line 271 "CSSValueKeywords.gperf" - {"overline", CSSValueOverline}, #line 162 "CSSValueKeywords.gperf" {"inside", CSSValueInside}, -#line 526 "CSSValueKeywords.gperf" +#line 499 "CSSValueKeywords.gperf" + {"seashell", CSSValueSeashell}, +#line 513 "CSSValueKeywords.gperf" + {"wheat", CSSValueWheat}, +#line 150 "CSSValueKeywords.gperf" + {"top", CSSValueTop}, +#line 156 "CSSValueKeywords.gperf" + {"center", CSSValueCenter}, +#line 474 "CSSValueKeywords.gperf" + {"midnightblue", CSSValueMidnightblue}, +#line 532 "CSSValueKeywords.gperf" {"central", CSSValueCentral}, -#line 340 "CSSValueKeywords.gperf" +#line 298 "CSSValueKeywords.gperf" + {"up", CSSValueUp}, +#line 521 "CSSValueKeywords.gperf" + {"linearrgb", CSSValueLinearrgb}, +#line 537 "CSSValueKeywords.gperf" + {"hanging", CSSValueHanging}, +#line 398 "CSSValueKeywords.gperf" + {"chartreuse", CSSValueChartreuse}, +#line 80 "CSSValueKeywords.gperf" + {"green", CSSValueGreen}, +#line 89 "CSSValueKeywords.gperf" + {"teal", CSSValueTeal}, +#line 245 "CSSValueKeywords.gperf" + {"avoid", CSSValueAvoid}, +#line 372 "CSSValueKeywords.gperf" + {"flat", CSSValueFlat}, +#line 343 "CSSValueKeywords.gperf" {"menulist", CSSValueMenulist}, -#line 538 "CSSValueKeywords.gperf" - {"tb-rl", CSSValueTbRl}, -#line 258 "CSSValueKeywords.gperf" - {"invert", CSSValueInvert}, -#line 374 "CSSValueKeywords.gperf" +#line 255 "CSSValueKeywords.gperf" + {"hand", CSSValueHand}, +#line 380 "CSSValueKeywords.gperf" {"reset", CSSValueReset}, -#line 265 "CSSValueKeywords.gperf" - {"mix", CSSValueMix}, -#line 243 "CSSValueKeywords.gperf" - {"absolute", CSSValueAbsolute}, -#line 232 "CSSValueKeywords.gperf" - {"all-scroll", CSSValueAllScroll}, -#line 190 "CSSValueKeywords.gperf" - {"inline-table", CSSValueInlineTable}, -#line 83 "CSSValueKeywords.gperf" - {"navy", CSSValueNavy}, -#line 11 "CSSValueKeywords.gperf" - {"inherit", CSSValueInherit}, -#line 332 "CSSValueKeywords.gperf" - {"listitem", CSSValueListitem}, -#line 303 "CSSValueKeywords.gperf" - {"slide", CSSValueSlide}, -#line 230 "CSSValueKeywords.gperf" - {"wait", CSSValueWait}, -#line 145 "CSSValueKeywords.gperf" - {"middle", CSSValueMiddle}, -#line 513 "CSSValueKeywords.gperf" - {"new", CSSValueNew}, -#line 275 "CSSValueKeywords.gperf" - {"pre-wrap", CSSValuePreWrap}, +#line 175 "CSSValueKeywords.gperf" + {"hebrew", CSSValueHebrew}, +#line 219 "CSSValueKeywords.gperf" + {"se-resize", CSSValueSeResize}, #line 37 "CSSValueKeywords.gperf" {"bold", CSSValueBold}, -#line 144 "CSSValueKeywords.gperf" - {"baseline", CSSValueBaseline}, -#line 72 "CSSValueKeywords.gperf" - {"fantasy", CSSValueFantasy}, -#line 141 "CSSValueKeywords.gperf" - {"xor", CSSValueXor}, -#line 27 "CSSValueKeywords.gperf" - {"small-caption", CSSValueSmallCaption}, -#line 130 "CSSValueKeywords.gperf" - {"no-repeat", CSSValueNoRepeat}, -#line 325 "CSSValueKeywords.gperf" - {"radio", CSSValueRadio}, +#line 154 "CSSValueKeywords.gperf" + {"left", CSSValueLeft}, +#line 528 "CSSValueKeywords.gperf" + {"bevel", CSSValueBevel}, +#line 439 "CSSValueKeywords.gperf" + {"indianred", CSSValueIndianred}, +#line 432 "CSSValueKeywords.gperf" + {"gainsboro", CSSValueGainsboro}, +#line 322 "CSSValueKeywords.gperf" + {"space", CSSValueSpace}, +#line 301 "CSSValueKeywords.gperf" + {"fast", CSSValueFast}, +#line 33 "CSSValueKeywords.gperf" + {"oblique", CSSValueOblique}, +#line 216 "CSSValueKeywords.gperf" + {"ne-resize", CSSValueNeResize}, #line 259 "CSSValueKeywords.gperf" {"landscape", CSSValueLandscape}, -#line 369 "CSSValueKeywords.gperf" - {"linear", CSSValueLinear}, -#line 57 "CSSValueKeywords.gperf" - {"smaller", CSSValueSmaller}, -#line 59 "CSSValueKeywords.gperf" - {"wider", CSSValueWider}, +#line 246 "CSSValueKeywords.gperf" + {"below", CSSValueBelow}, #line 120 "CSSValueKeywords.gperf" {"window", CSSValueWindow}, -#line 32 "CSSValueKeywords.gperf" - {"italic", CSSValueItalic}, -#line 163 "CSSValueKeywords.gperf" - {"disc", CSSValueDisc}, -#line 198 "CSSValueKeywords.gperf" - {"table-caption", CSSValueTableCaption}, -#line 272 "CSSValueKeywords.gperf" - {"portrait", CSSValuePortrait}, -#line 185 "CSSValueKeywords.gperf" - {"list-item", CSSValueListItem}, -#line 231 "CSSValueKeywords.gperf" - {"help", CSSValueHelp}, -#line 270 "CSSValueKeywords.gperf" - {"overlay", CSSValueOverlay}, -#line 280 "CSSValueKeywords.gperf" - {"static", CSSValueStatic}, -#line 166 "CSSValueKeywords.gperf" - {"decimal", CSSValueDecimal}, -#line 148 "CSSValueKeywords.gperf" - {"text-top", CSSValueTextTop}, -#line 511 "CSSValueKeywords.gperf" - {"evenodd", CSSValueEvenodd}, -#line 236 "CSSValueKeywords.gperf" - {"rtl", CSSValueRtl}, -#line 151 "CSSValueKeywords.gperf" - {"bottom", CSSValueBottom}, -#line 537 "CSSValueKeywords.gperf" - {"rl-tb", CSSValueRlTb}, -#line 50 "CSSValueKeywords.gperf" - {"x-small", CSSValueXSmall}, -#line 63 "CSSValueKeywords.gperf" - {"condensed", CSSValueCondensed}, -#line 70 "CSSValueKeywords.gperf" - {"sans-serif", CSSValueSansSerif}, -#line 363 "CSSValueKeywords.gperf" - {"logical", CSSValueLogical}, -#line 288 "CSSValueKeywords.gperf" - {"reverse", CSSValueReverse}, -#line 435 "CSSValueKeywords.gperf" - {"ivory", CSSValueIvory}, -#line 469 "CSSValueKeywords.gperf" - {"mintcream", CSSValueMintcream}, -#line 295 "CSSValueKeywords.gperf" - {"forwards", CSSValueForwards}, -#line 283 "CSSValueKeywords.gperf" - {"underline", CSSValueUnderline}, -#line 433 "CSSValueKeywords.gperf" - {"indianred", CSSValueIndianred}, -#line 440 "CSSValueKeywords.gperf" - {"lemonchiffon", CSSValueLemonchiffon}, -#line 354 "CSSValueKeywords.gperf" - {"textfield", CSSValueTextfield}, -#line 204 "CSSValueKeywords.gperf" - {"pointer", CSSValuePointer}, -#line 355 "CSSValueKeywords.gperf" - {"textarea", CSSValueTextarea}, -#line 194 "CSSValueKeywords.gperf" - {"table-row", CSSValueTableRow}, -#line 371 "CSSValueKeywords.gperf" - {"ease-out", CSSValueEaseOut}, -#line 254 "CSSValueKeywords.gperf" - {"fixed", CSSValueFixed}, -#line 304 "CSSValueKeywords.gperf" - {"alternate", CSSValueAlternate}, -#line 514 "CSSValueKeywords.gperf" - {"srgb", CSSValueSrgb}, -#line 291 "CSSValueKeywords.gperf" - {"inline-axis", CSSValueInlineAxis}, +#line 271 "CSSValueKeywords.gperf" + {"overline", CSSValueOverline}, +#line 434 "CSSValueKeywords.gperf" + {"gold", CSSValueGold}, #line 211 "CSSValueKeywords.gperf" {"no-drop", CSSValueNoDrop}, -#line 381 "CSSValueKeywords.gperf" - {"aliceblue", CSSValueAliceblue}, -#line 196 "CSSValueKeywords.gperf" - {"table-column", CSSValueTableColumn}, -#line 150 "CSSValueKeywords.gperf" - {"top", CSSValueTop}, -#line 256 "CSSValueKeywords.gperf" - {"hide", CSSValueHide}, -#line 310 "CSSValueKeywords.gperf" - {"intrinsic", CSSValueIntrinsic}, -#line 493 "CSSValueKeywords.gperf" - {"seashell", CSSValueSeashell}, -#line 244 "CSSValueKeywords.gperf" - {"always", CSSValueAlways}, -#line 92 "CSSValueKeywords.gperf" - {"transparent", CSSValueTransparent}, +#line 524 "CSSValueKeywords.gperf" + {"crispedges", CSSValueCrispedges}, +#line 384 "CSSValueKeywords.gperf" + {"painted", CSSValuePainted}, +#line 490 "CSSValueKeywords.gperf" + {"pink", CSSValuePink}, #line 391 "CSSValueKeywords.gperf" - {"cadetblue", CSSValueCadetblue}, -#line 338 "CSSValueKeywords.gperf" - {"media-slider", CSSValueMediaSlider}, -#line 496 "CSSValueKeywords.gperf" - {"slateblue", CSSValueSlateblue}, -#line 64 "CSSValueKeywords.gperf" - {"semi-condensed", CSSValueSemiCondensed}, -#line 212 "CSSValueKeywords.gperf" - {"not-allowed", CSSValueNotAllowed}, + {"beige", CSSValueBeige}, +#line 141 "CSSValueKeywords.gperf" + {"xor", CSSValueXor}, +#line 288 "CSSValueKeywords.gperf" + {"reverse", CSSValueReverse}, #line 146 "CSSValueKeywords.gperf" {"sub", CSSValueSub}, -#line 138 "CSSValueKeywords.gperf" - {"destination-in", CSSValueDestinationIn}, -#line 501 "CSSValueKeywords.gperf" - {"steelblue", CSSValueSteelblue}, -#line 318 "CSSValueKeywords.gperf" - {"continuous", CSSValueContinuous}, -#line 49 "CSSValueKeywords.gperf" - {"xx-small", CSSValueXxSmall}, +#line 84 "CSSValueKeywords.gperf" + {"olive", CSSValueOlive}, +#line 265 "CSSValueKeywords.gperf" + {"mix", CSSValueMix}, #line 114 "CSSValueKeywords.gperf" {"scrollbar", CSSValueScrollbar}, -#line 358 "CSSValueKeywords.gperf" +#line 361 "CSSValueKeywords.gperf" {"border", CSSValueBorder}, -#line 378 "CSSValueKeywords.gperf" - {"painted", CSSValuePainted}, -#line 242 "CSSValueKeywords.gperf" - {"above", CSSValueAbove}, -#line 299 "CSSValueKeywords.gperf" - {"down", CSSValueDown}, -#line 215 "CSSValueKeywords.gperf" - {"e-resize", CSSValueEResize}, #line 38 "CSSValueKeywords.gperf" {"bolder", CSSValueBolder}, -#line 521 "CSSValueKeywords.gperf" - {"miter", CSSValueMiter}, -#line 221 "CSSValueKeywords.gperf" - {"s-resize", CSSValueSResize}, -#line 322 "CSSValueKeywords.gperf" - {"space", CSSValueSpace}, -#line 437 "CSSValueKeywords.gperf" - {"lavender", CSSValueLavender}, -#line 485 "CSSValueKeywords.gperf" +#line 23 "CSSValueKeywords.gperf" + {"caption", CSSValueCaption}, +#line 242 "CSSValueKeywords.gperf" + {"above", CSSValueAbove}, +#line 430 "CSSValueKeywords.gperf" + {"floralwhite", CSSValueFloralwhite}, +#line 507 "CSSValueKeywords.gperf" + {"steelblue", CSSValueSteelblue}, +#line 536 "CSSValueKeywords.gperf" + {"alphabetic", CSSValueAlphabetic}, +#line 281 "CSSValueKeywords.gperf" + {"thick", CSSValueThick}, +#line 491 "CSSValueKeywords.gperf" {"plum", CSSValuePlum}, -#line 263 "CSSValueKeywords.gperf" - {"lower", CSSValueLower}, -#line 460 "CSSValueKeywords.gperf" - {"mediumblue", CSSValueMediumblue}, -#line 458 "CSSValueKeywords.gperf" - {"magenta", CSSValueMagenta}, -#line 140 "CSSValueKeywords.gperf" - {"destination-atop", CSSValueDestinationAtop}, -#line 218 "CSSValueKeywords.gperf" - {"n-resize", CSSValueNResize}, -#line 222 "CSSValueKeywords.gperf" - {"w-resize", CSSValueWResize}, -#line 149 "CSSValueKeywords.gperf" - {"text-bottom", CSSValueTextBottom}, +#line 402 "CSSValueKeywords.gperf" + {"cornsilk", CSSValueCornsilk}, #line 86 "CSSValueKeywords.gperf" {"purple", CSSValuePurple}, -#line 286 "CSSValueKeywords.gperf" - {"start", CSSValueStart}, +#line 386 "CSSValueKeywords.gperf" + {"stroke", CSSValueStroke}, +#line 50 "CSSValueKeywords.gperf" + {"x-small", CSSValueXSmall}, +#line 69 "CSSValueKeywords.gperf" + {"serif", CSSValueSerif}, +#line 392 "CSSValueKeywords.gperf" + {"bisque", CSSValueBisque}, +#line 466 "CSSValueKeywords.gperf" + {"mediumblue", CSSValueMediumblue}, +#line 431 "CSSValueKeywords.gperf" + {"forestgreen", CSSValueForestgreen}, +#line 535 "CSSValueKeywords.gperf" + {"ideographic", CSSValueIdeographic}, +#line 512 "CSSValueKeywords.gperf" + {"violet", CSSValueViolet}, +#line 201 "CSSValueKeywords.gperf" + {"auto", CSSValueAuto}, +#line 390 "CSSValueKeywords.gperf" + {"azure", CSSValueAzure}, +#line 443 "CSSValueKeywords.gperf" + {"lavender", CSSValueLavender}, +#line 75 "CSSValueKeywords.gperf" + {"aqua", CSSValueAqua}, +#line 263 "CSSValueKeywords.gperf" + {"lower", CSSValueLower}, +#line 237 "CSSValueKeywords.gperf" + {"capitalize", CSSValueCapitalize}, +#line 468 "CSSValueKeywords.gperf" + {"mediumpurple", CSSValueMediumpurple}, +#line 88 "CSSValueKeywords.gperf" + {"silver", CSSValueSilver}, +#line 454 "CSSValueKeywords.gperf" + {"lightpink", CSSValueLightpink}, +#line 297 "CSSValueKeywords.gperf" + {"ahead", CSSValueAhead}, +#line 363 "CSSValueKeywords.gperf" + {"padding", CSSValuePadding}, +#line 449 "CSSValueKeywords.gperf" + {"lightcyan", CSSValueLightcyan}, +#line 248 "CSSValueKeywords.gperf" + {"blink", CSSValueBlink}, #line 239 "CSSValueKeywords.gperf" {"lowercase", CSSValueLowercase}, -#line 372 "CSSValueKeywords.gperf" - {"ease-in-out", CSSValueEaseInOut}, -#line 60 "CSSValueKeywords.gperf" - {"narrower", CSSValueNarrower}, -#line 311 "CSSValueKeywords.gperf" - {"min-intrinsic", CSSValueMinIntrinsic}, -#line 175 "CSSValueKeywords.gperf" - {"hebrew", CSSValueHebrew}, -#line 309 "CSSValueKeywords.gperf" - {"ignore", CSSValueIgnore}, -#line 121 "CSSValueKeywords.gperf" - {"windowframe", CSSValueWindowframe}, -#line 290 "CSSValueKeywords.gperf" - {"vertical", CSSValueVertical}, -#line 268 "CSSValueKeywords.gperf" - {"nowrap", CSSValueNowrap}, -#line 298 "CSSValueKeywords.gperf" - {"up", CSSValueUp}, -#line 285 "CSSValueKeywords.gperf" - {"stretch", CSSValueStretch}, -#line 132 "CSSValueKeywords.gperf" - {"copy", CSSValueCopy}, -#line 533 "CSSValueKeywords.gperf" - {"use-script", CSSValueUseScript}, -#line 395 "CSSValueKeywords.gperf" - {"cornflowerblue", CSSValueCornflowerblue}, -#line 396 "CSSValueKeywords.gperf" - {"cornsilk", CSSValueCornsilk}, -#line 464 "CSSValueKeywords.gperf" - {"mediumslateblue", CSSValueMediumslateblue}, -#line 19 "CSSValueKeywords.gperf" - {"dotted", CSSValueDotted}, -#line 470 "CSSValueKeywords.gperf" - {"mistyrose", CSSValueMistyrose}, -#line 202 "CSSValueKeywords.gperf" - {"crosshair", CSSValueCrosshair}, -#line 113 "CSSValueKeywords.gperf" - {"menutext", CSSValueMenutext}, +#line 498 "CSSValueKeywords.gperf" + {"seagreen", CSSValueSeagreen}, #line 294 "CSSValueKeywords.gperf" {"multiple", CSSValueMultiple}, #line 77 "CSSValueKeywords.gperf" {"blue", CSSValueBlue}, -#line 23 "CSSValueKeywords.gperf" - {"caption", CSSValueCaption}, -#line 398 "CSSValueKeywords.gperf" - {"cyan", CSSValueCyan}, -#line 80 "CSSValueKeywords.gperf" - {"green", CSSValueGreen}, -#line 33 "CSSValueKeywords.gperf" - {"oblique", CSSValueOblique}, -#line 373 "CSSValueKeywords.gperf" - {"document", CSSValueDocument}, -#line 255 "CSSValueKeywords.gperf" - {"hand", CSSValueHand}, -#line 84 "CSSValueKeywords.gperf" - {"olive", CSSValueOlive}, -#line 362 "CSSValueKeywords.gperf" - {"content-box", CSSValueContentBox}, -#line 127 "CSSValueKeywords.gperf" - {"repeat", CSSValueRepeat}, -#line 278 "CSSValueKeywords.gperf" - {"separate", CSSValueSeparate}, -#line 434 "CSSValueKeywords.gperf" - {"indigo", CSSValueIndigo}, -#line 154 "CSSValueKeywords.gperf" - {"left", CSSValueLeft}, -#line 489 "CSSValueKeywords.gperf" - {"saddlebrown", CSSValueSaddlebrown}, -#line 112 "CSSValueKeywords.gperf" - {"match", CSSValueMatch}, -#line 14 "CSSValueKeywords.gperf" - {"hidden", CSSValueHidden}, -#line 462 "CSSValueKeywords.gperf" - {"mediumpurple", CSSValueMediumpurple}, -#line 249 "CSSValueKeywords.gperf" - {"both", CSSValueBoth}, -#line 331 "CSSValueKeywords.gperf" - {"listbox", CSSValueListbox}, -#line 424 "CSSValueKeywords.gperf" - {"floralwhite", CSSValueFloralwhite}, -#line 201 "CSSValueKeywords.gperf" - {"auto", CSSValueAuto}, #line 184 "CSSValueKeywords.gperf" {"block", CSSValueBlock}, -#line 484 "CSSValueKeywords.gperf" - {"pink", CSSValuePink}, -#line 384 "CSSValueKeywords.gperf" - {"azure", CSSValueAzure}, -#line 75 "CSSValueKeywords.gperf" - {"aqua", CSSValueAqua}, -#line 172 "CSSValueKeywords.gperf" - {"lower-latin", CSSValueLowerLatin}, -#line 262 "CSSValueKeywords.gperf" - {"loud", CSSValueLoud}, -#line 139 "CSSValueKeywords.gperf" - {"destination-out", CSSValueDestinationOut}, -#line 506 "CSSValueKeywords.gperf" - {"violet", CSSValueViolet}, -#line 380 "CSSValueKeywords.gperf" - {"stroke", CSSValueStroke}, -#line 320 "CSSValueKeywords.gperf" - {"break-all", CSSValueBreakAll}, -#line 482 "CSSValueKeywords.gperf" - {"peachpuff", CSSValuePeachpuff}, -#line 476 "CSSValueKeywords.gperf" - {"orchid", CSSValueOrchid}, -#line 208 "CSSValueKeywords.gperf" - {"context-menu", CSSValueContextMenu}, -#line 431 "CSSValueKeywords.gperf" - {"honeydew", CSSValueHoneydew}, -#line 219 "CSSValueKeywords.gperf" - {"se-resize", CSSValueSeResize}, +#line 469 "CSSValueKeywords.gperf" + {"mediumseagreen", CSSValueMediumseagreen}, +#line 470 "CSSValueKeywords.gperf" + {"mediumslateblue", CSSValueMediumslateblue}, +#line 514 "CSSValueKeywords.gperf" + {"whitesmoke", CSSValueWhitesmoke}, #line 18 "CSSValueKeywords.gperf" {"outset", CSSValueOutset}, -#line 281 "CSSValueKeywords.gperf" - {"thick", CSSValueThick}, -#line 305 "CSSValueKeywords.gperf" - {"read-only", CSSValueReadOnly}, -#line 510 "CSSValueKeywords.gperf" - {"nonzero", CSSValueNonzero}, -#line 472 "CSSValueKeywords.gperf" - {"navajowhite", CSSValueNavajowhite}, -#line 53 "CSSValueKeywords.gperf" - {"large", CSSValueLarge}, -#line 314 "CSSValueKeywords.gperf" - {"discard", CSSValueDiscard}, -#line 216 "CSSValueKeywords.gperf" - {"ne-resize", CSSValueNeResize}, -#line 342 "CSSValueKeywords.gperf" - {"menulist-text", CSSValueMenulistText}, -#line 302 "CSSValueKeywords.gperf" - {"infinite", CSSValueInfinite}, -#line 250 "CSSValueKeywords.gperf" - {"close-quote", CSSValueCloseQuote}, -#line 319 "CSSValueKeywords.gperf" - {"skip-white-space", CSSValueSkipWhiteSpace}, -#line 85 "CSSValueKeywords.gperf" - {"orange", CSSValueOrange}, -#line 293 "CSSValueKeywords.gperf" - {"single", CSSValueSingle}, -#line 508 "CSSValueKeywords.gperf" - {"whitesmoke", CSSValueWhitesmoke}, -#line 532 "CSSValueKeywords.gperf" - {"mathematical", CSSValueMathematical}, -#line 341 "CSSValueKeywords.gperf" - {"menulist-button", CSSValueMenulistButton}, -#line 335 "CSSValueKeywords.gperf" - {"media-play-button", CSSValueMediaPlayButton}, -#line 122 "CSSValueKeywords.gperf" - {"windowtext", CSSValueWindowtext}, -#line 125 "CSSValueKeywords.gperf" - {"grey", CSSValueGrey}, -#line 276 "CSSValueKeywords.gperf" - {"relative", CSSValueRelative}, +#line 368 "CSSValueKeywords.gperf" + {"visual", CSSValueVisual}, +#line 268 "CSSValueKeywords.gperf" + {"nowrap", CSSValueNowrap}, +#line 232 "CSSValueKeywords.gperf" + {"all-scroll", CSSValueAllScroll}, +#line 438 "CSSValueKeywords.gperf" + {"hotpink", CSSValueHotpink}, +#line 116 "CSSValueKeywords.gperf" + {"threedface", CSSValueThreedface}, +#line 481 "CSSValueKeywords.gperf" + {"orangered", CSSValueOrangered}, +#line 482 "CSSValueKeywords.gperf" + {"orchid", CSSValueOrchid}, +#line 223 "CSSValueKeywords.gperf" + {"ew-resize", CSSValueEwResize}, +#line 220 "CSSValueKeywords.gperf" + {"sw-resize", CSSValueSwResize}, +#line 388 "CSSValueKeywords.gperf" + {"antiquewhite", CSSValueAntiquewhite}, +#line 461 "CSSValueKeywords.gperf" + {"lightyellow", CSSValueLightyellow}, +#line 16 "CSSValueKeywords.gperf" + {"groove", CSSValueGroove}, +#line 185 "CSSValueKeywords.gperf" + {"list-item", CSSValueListItem}, +#line 401 "CSSValueKeywords.gperf" + {"cornflowerblue", CSSValueCornflowerblue}, +#line 217 "CSSValueKeywords.gperf" + {"nw-resize", CSSValueNwResize}, +#line 63 "CSSValueKeywords.gperf" + {"condensed", CSSValueCondensed}, +#line 240 "CSSValueKeywords.gperf" + {"visible", CSSValueVisible}, +#line 165 "CSSValueKeywords.gperf" + {"square", CSSValueSquare}, +#line 177 "CSSValueKeywords.gperf" + {"georgian", CSSValueGeorgian}, +#line 35 "CSSValueKeywords.gperf" + {"small-caps", CSSValueSmallCaps}, +#line 331 "CSSValueKeywords.gperf" + {"listbox", CSSValueListbox}, +#line 197 "CSSValueKeywords.gperf" + {"table-cell", CSSValueTableCell}, +#line 376 "CSSValueKeywords.gperf" + {"ease-in", CSSValueEaseIn}, +#line 476 "CSSValueKeywords.gperf" + {"mistyrose", CSSValueMistyrose}, +#line 83 "CSSValueKeywords.gperf" + {"navy", CSSValueNavy}, #line 76 "CSSValueKeywords.gperf" {"black", CSSValueBlack}, -#line 392 "CSSValueKeywords.gperf" - {"chartreuse", CSSValueChartreuse}, -#line 418 "CSSValueKeywords.gperf" - {"deeppink", CSSValueDeeppink}, -#line 186 "CSSValueKeywords.gperf" - {"run-in", CSSValueRunIn}, -#line 266 "CSSValueKeywords.gperf" - {"no-close-quote", CSSValueNoCloseQuote}, -#line 512 "CSSValueKeywords.gperf" - {"accumulate", CSSValueAccumulate}, -#line 224 "CSSValueKeywords.gperf" - {"ns-resize", CSSValueNsResize}, -#line 487 "CSSValueKeywords.gperf" - {"rosybrown", CSSValueRosybrown}, -#line 188 "CSSValueKeywords.gperf" - {"inline-block", CSSValueInlineBlock}, -#line 119 "CSSValueKeywords.gperf" - {"threedshadow", CSSValueThreedshadow}, #line 495 "CSSValueKeywords.gperf" - {"skyblue", CSSValueSkyblue}, -#line 65 "CSSValueKeywords.gperf" - {"semi-expanded", CSSValueSemiExpanded}, + {"saddlebrown", CSSValueSaddlebrown}, +#line 441 "CSSValueKeywords.gperf" + {"ivory", CSSValueIvory}, #line 227 "CSSValueKeywords.gperf" {"col-resize", CSSValueColResize}, -#line 248 "CSSValueKeywords.gperf" - {"blink", CSSValueBlink}, -#line 367 "CSSValueKeywords.gperf" - {"paused", CSSValuePaused}, -#line 267 "CSSValueKeywords.gperf" - {"no-open-quote", CSSValueNoOpenQuote}, -#line 22 "CSSValueKeywords.gperf" - {"double", CSSValueDouble}, -#line 134 "CSSValueKeywords.gperf" - {"source-in", CSSValueSourceIn}, -#line 334 "CSSValueKeywords.gperf" - {"media-mute-button", CSSValueMediaMuteButton}, -#line 491 "CSSValueKeywords.gperf" - {"sandybrown", CSSValueSandybrown}, -#line 428 "CSSValueKeywords.gperf" - {"gold", CSSValueGold}, -#line 240 "CSSValueKeywords.gperf" - {"visible", CSSValueVisible}, -#line 430 "CSSValueKeywords.gperf" - {"greenyellow", CSSValueGreenyellow}, -#line 168 "CSSValueKeywords.gperf" - {"lower-roman", CSSValueLowerRoman}, -#line 306 "CSSValueKeywords.gperf" - {"read-write", CSSValueReadWrite}, -#line 88 "CSSValueKeywords.gperf" - {"silver", CSSValueSilver}, -#line 225 "CSSValueKeywords.gperf" - {"nesw-resize", CSSValueNeswResize}, -#line 520 "CSSValueKeywords.gperf" +#line 389 "CSSValueKeywords.gperf" + {"aquamarine", CSSValueAquamarine}, +#line 54 "CSSValueKeywords.gperf" + {"x-large", CSSValueXLarge}, +#line 526 "CSSValueKeywords.gperf" {"butt", CSSValueButt}, -#line 108 "CSSValueKeywords.gperf" - {"inactivecaption", CSSValueInactivecaption}, -#line 535 "CSSValueKeywords.gperf" - {"reset-size", CSSValueResetSize}, -#line 376 "CSSValueKeywords.gperf" - {"visiblefill", CSSValueVisiblefill}, -#line 20 "CSSValueKeywords.gperf" - {"dashed", CSSValueDashed}, -#line 129 "CSSValueKeywords.gperf" - {"repeat-y", CSSValueRepeatY}, -#line 411 "CSSValueKeywords.gperf" - {"darksalmon", CSSValueDarksalmon}, -#line 136 "CSSValueKeywords.gperf" - {"source-atop", CSSValueSourceAtop}, +#line 111 "CSSValueKeywords.gperf" + {"infotext", CSSValueInfotext}, +#line 190 "CSSValueKeywords.gperf" + {"inline-table", CSSValueInlineTable}, +#line 428 "CSSValueKeywords.gperf" + {"dodgerblue", CSSValueDodgerblue}, +#line 127 "CSSValueKeywords.gperf" + {"repeat", CSSValueRepeat}, +#line 506 "CSSValueKeywords.gperf" + {"springgreen", CSSValueSpringgreen}, +#line 278 "CSSValueKeywords.gperf" + {"separate", CSSValueSeparate}, #line 328 "CSSValueKeywords.gperf" {"button", CSSValueButton}, -#line 364 "CSSValueKeywords.gperf" - {"visual", CSSValueVisual}, -#line 385 "CSSValueKeywords.gperf" - {"beige", CSSValueBeige}, -#line 210 "CSSValueKeywords.gperf" - {"progress", CSSValueProgress}, -#line 349 "CSSValueKeywords.gperf" - {"searchfield", CSSValueSearchfield}, -#line 161 "CSSValueKeywords.gperf" - {"outside", CSSValueOutside}, -#line 99 "CSSValueKeywords.gperf" - {"buttonface", CSSValueButtonface}, -#line 165 "CSSValueKeywords.gperf" - {"square", CSSValueSquare}, +#line 311 "CSSValueKeywords.gperf" + {"min-intrinsic", CSSValueMinIntrinsic}, #line 79 "CSSValueKeywords.gperf" {"gray", CSSValueGray}, -#line 386 "CSSValueKeywords.gperf" - {"bisque", CSSValueBisque}, -#line 157 "CSSValueKeywords.gperf" - {"justify", CSSValueJustify}, -#line 357 "CSSValueKeywords.gperf" +#line 117 "CSSValueKeywords.gperf" + {"threedhighlight", CSSValueThreedhighlight}, +#line 314 "CSSValueKeywords.gperf" + {"discard", CSSValueDiscard}, +#line 27 "CSSValueKeywords.gperf" + {"small-caption", CSSValueSmallCaption}, +#line 19 "CSSValueKeywords.gperf" + {"dotted", CSSValueDotted}, +#line 124 "CSSValueKeywords.gperf" + {"currentcolor", CSSValueCurrentcolor}, +#line 525 "CSSValueKeywords.gperf" + {"geometricprecision", CSSValueGeometricprecision}, +#line 295 "CSSValueKeywords.gperf" + {"forwards", CSSValueForwards}, +#line 519 "CSSValueKeywords.gperf" + {"new", CSSValueNew}, +#line 370 "CSSValueKeywords.gperf" + {"running", CSSValueRunning}, +#line 119 "CSSValueKeywords.gperf" + {"threedshadow", CSSValueThreedshadow}, +#line 20 "CSSValueKeywords.gperf" + {"dashed", CSSValueDashed}, +#line 377 "CSSValueKeywords.gperf" + {"ease-out", CSSValueEaseOut}, +#line 198 "CSSValueKeywords.gperf" + {"table-caption", CSSValueTableCaption}, +#line 485 "CSSValueKeywords.gperf" + {"paleturquoise", CSSValuePaleturquoise}, +#line 379 "CSSValueKeywords.gperf" + {"document", CSSValueDocument}, +#line 196 "CSSValueKeywords.gperf" + {"table-column", CSSValueTableColumn}, +#line 444 "CSSValueKeywords.gperf" + {"lavenderblush", CSSValueLavenderblush}, +#line 453 "CSSValueKeywords.gperf" + {"lightgrey", CSSValueLightgrey}, +#line 451 "CSSValueKeywords.gperf" + {"lightgray", CSSValueLightgray}, +#line 181 "CSSValueKeywords.gperf" + {"hiragana-iroha", CSSValueHiraganaIroha}, +#line 106 "CSSValueKeywords.gperf" + {"highlighttext", CSSValueHighlighttext}, +#line 108 "CSSValueKeywords.gperf" + {"inactivecaption", CSSValueInactivecaption}, +#line 467 "CSSValueKeywords.gperf" + {"mediumorchid", CSSValueMediumorchid}, +#line 194 "CSSValueKeywords.gperf" + {"table-row", CSSValueTableRow}, +#line 121 "CSSValueKeywords.gperf" + {"windowframe", CSSValueWindowframe}, +#line 299 "CSSValueKeywords.gperf" + {"down", CSSValueDown}, +#line 518 "CSSValueKeywords.gperf" + {"accumulate", CSSValueAccumulate}, +#line 203 "CSSValueKeywords.gperf" + {"default", CSSValueDefault}, +#line 445 "CSSValueKeywords.gperf" + {"lawngreen", CSSValueLawngreen}, +#line 262 "CSSValueKeywords.gperf" + {"loud", CSSValueLoud}, +#line 274 "CSSValueKeywords.gperf" + {"pre-line", CSSValuePreLine}, +#line 459 "CSSValueKeywords.gperf" + {"lightslategrey", CSSValueLightslategrey}, +#line 458 "CSSValueKeywords.gperf" + {"lightslategray", CSSValueLightslategray}, +#line 290 "CSSValueKeywords.gperf" + {"vertical", CSSValueVertical}, +#line 238 "CSSValueKeywords.gperf" + {"uppercase", CSSValueUppercase}, +#line 522 "CSSValueKeywords.gperf" + {"optimizespeed", CSSValueOptimizespeed}, +#line 229 "CSSValueKeywords.gperf" + {"text", CSSValueText}, +#line 91 "CSSValueKeywords.gperf" + {"yellow", CSSValueYellow}, +#line 261 "CSSValueKeywords.gperf" + {"line-through", CSSValueLineThrough}, +#line 132 "CSSValueKeywords.gperf" + {"copy", CSSValueCopy}, +#line 504 "CSSValueKeywords.gperf" + {"slategrey", CSSValueSlategrey}, +#line 503 "CSSValueKeywords.gperf" + {"slategray", CSSValueSlategray}, +#line 435 "CSSValueKeywords.gperf" + {"goldenrod", CSSValueGoldenrod}, +#line 471 "CSSValueKeywords.gperf" + {"mediumspringgreen", CSSValueMediumspringgreen}, +#line 446 "CSSValueKeywords.gperf" + {"lemonchiffon", CSSValueLemonchiffon}, +#line 393 "CSSValueKeywords.gperf" + {"blanchedalmond", CSSValueBlanchedalmond}, +#line 125 "CSSValueKeywords.gperf" + {"grey", CSSValueGrey}, +#line 161 "CSSValueKeywords.gperf" + {"outside", CSSValueOutside}, +#line 166 "CSSValueKeywords.gperf" + {"decimal", CSSValueDecimal}, +#line 113 "CSSValueKeywords.gperf" + {"menutext", CSSValueMenutext}, +#line 437 "CSSValueKeywords.gperf" + {"honeydew", CSSValueHoneydew}, +#line 276 "CSSValueKeywords.gperf" + {"relative", CSSValueRelative}, +#line 147 "CSSValueKeywords.gperf" + {"super", CSSValueSuper}, +#line 417 "CSSValueKeywords.gperf" + {"darksalmon", CSSValueDarksalmon}, +#line 360 "CSSValueKeywords.gperf" {"round", CSSValueRound}, -#line 425 "CSSValueKeywords.gperf" - {"forestgreen", CSSValueForestgreen}, +#line 72 "CSSValueKeywords.gperf" + {"fantasy", CSSValueFantasy}, +#line 465 "CSSValueKeywords.gperf" + {"mediumaquamarine", CSSValueMediumaquamarine}, +#line 493 "CSSValueKeywords.gperf" + {"rosybrown", CSSValueRosybrown}, +#line 371 "CSSValueKeywords.gperf" + {"paused", CSSValuePaused}, +#line 22 "CSSValueKeywords.gperf" + {"double", CSSValueDouble}, +#line 270 "CSSValueKeywords.gperf" + {"overlay", CSSValueOverlay}, +#line 358 "CSSValueKeywords.gperf" + {"textarea", CSSValueTextarea}, +#line 429 "CSSValueKeywords.gperf" + {"firebrick", CSSValueFirebrick}, +#line 382 "CSSValueKeywords.gperf" + {"visiblefill", CSSValueVisiblefill}, +#line 517 "CSSValueKeywords.gperf" + {"evenodd", CSSValueEvenodd}, +#line 118 "CSSValueKeywords.gperf" + {"threedlightshadow", CSSValueThreedlightshadow}, +#line 275 "CSSValueKeywords.gperf" + {"pre-wrap", CSSValuePreWrap}, +#line 511 "CSSValueKeywords.gperf" + {"turquoise", CSSValueTurquoise}, +#line 70 "CSSValueKeywords.gperf" + {"sans-serif", CSSValueSansSerif}, #line 31 "CSSValueKeywords.gperf" {"status-bar", CSSValueStatusBar}, -#line 66 "CSSValueKeywords.gperf" - {"expanded", CSSValueExpanded}, -#line 449 "CSSValueKeywords.gperf" - {"lightsalmon", CSSValueLightsalmon}, -#line 58 "CSSValueKeywords.gperf" - {"larger", CSSValueLarger}, -#line 383 "CSSValueKeywords.gperf" - {"aquamarine", CSSValueAquamarine}, -#line 17 "CSSValueKeywords.gperf" - {"ridge", CSSValueRidge}, -#line 343 "CSSValueKeywords.gperf" - {"menulist-textfield", CSSValueMenulistTextfield}, -#line 492 "CSSValueKeywords.gperf" - {"seagreen", CSSValueSeagreen}, -#line 289 "CSSValueKeywords.gperf" - {"horizontal", CSSValueHorizontal}, -#line 315 "CSSValueKeywords.gperf" - {"dot-dash", CSSValueDotDash}, -#line 530 "CSSValueKeywords.gperf" - {"alphabetic", CSSValueAlphabetic}, -#line 518 "CSSValueKeywords.gperf" - {"crispedges", CSSValueCrispedges}, -#line 360 "CSSValueKeywords.gperf" - {"padding", CSSValuePadding}, -#line 171 "CSSValueKeywords.gperf" - {"lower-alpha", CSSValueLowerAlpha}, -#line 390 "CSSValueKeywords.gperf" - {"burlywood", CSSValueBurlywood}, -#line 461 "CSSValueKeywords.gperf" - {"mediumorchid", CSSValueMediumorchid}, -#line 478 "CSSValueKeywords.gperf" - {"palegreen", CSSValuePalegreen}, -#line 456 "CSSValueKeywords.gperf" - {"limegreen", CSSValueLimegreen}, -#line 124 "CSSValueKeywords.gperf" - {"currentcolor", CSSValueCurrentcolor}, -#line 324 "CSSValueKeywords.gperf" - {"checkbox", CSSValueCheckbox}, -#line 62 "CSSValueKeywords.gperf" - {"extra-condensed", CSSValueExtraCondensed}, -#line 400 "CSSValueKeywords.gperf" - {"darkcyan", CSSValueDarkcyan}, -#line 333 "CSSValueKeywords.gperf" - {"media-fullscreen-button", CSSValueMediaFullscreenButton}, +#line 483 "CSSValueKeywords.gperf" + {"palegoldenrod", CSSValuePalegoldenrod}, +#line 244 "CSSValueKeywords.gperf" + {"always", CSSValueAlways}, +#line 436 "CSSValueKeywords.gperf" + {"greenyellow", CSSValueGreenyellow}, +#line 250 "CSSValueKeywords.gperf" + {"close-quote", CSSValueCloseQuote}, +#line 480 "CSSValueKeywords.gperf" + {"olivedrab", CSSValueOlivedrab}, +#line 541 "CSSValueKeywords.gperf" + {"reset-size", CSSValueResetSize}, +#line 212 "CSSValueKeywords.gperf" + {"not-allowed", CSSValueNotAllowed}, #line 96 "CSSValueKeywords.gperf" {"activecaption", CSSValueActivecaption}, -#line 423 "CSSValueKeywords.gperf" - {"firebrick", CSSValueFirebrick}, +#line 99 "CSSValueKeywords.gperf" + {"buttonface", CSSValueButtonface}, +#line 122 "CSSValueKeywords.gperf" + {"windowtext", CSSValueWindowtext}, +#line 472 "CSSValueKeywords.gperf" + {"mediumturquoise", CSSValueMediumturquoise}, +#line 49 "CSSValueKeywords.gperf" + {"xx-small", CSSValueXxSmall}, #line 71 "CSSValueKeywords.gperf" {"cursive", CSSValueCursive}, -#line 361 "CSSValueKeywords.gperf" - {"border-box", CSSValueBorderBox}, -#line 128 "CSSValueKeywords.gperf" - {"repeat-x", CSSValueRepeatX}, -#line 387 "CSSValueKeywords.gperf" - {"blanchedalmond", CSSValueBlanchedalmond}, -#line 135 "CSSValueKeywords.gperf" - {"source-out", CSSValueSourceOut}, -#line 509 "CSSValueKeywords.gperf" - {"yellowgreen", CSSValueYellowgreen}, +#line 266 "CSSValueKeywords.gperf" + {"no-close-quote", CSSValueNoCloseQuote}, +#line 427 "CSSValueKeywords.gperf" + {"dimgrey", CSSValueDimgrey}, +#line 426 "CSSValueKeywords.gperf" + {"dimgray", CSSValueDimgray}, #line 488 "CSSValueKeywords.gperf" - {"royalblue", CSSValueRoyalblue}, -#line 203 "CSSValueKeywords.gperf" - {"default", CSSValueDefault}, -#line 78 "CSSValueKeywords.gperf" - {"fuchsia", CSSValueFuchsia}, + {"peachpuff", CSSValuePeachpuff}, +#line 225 "CSSValueKeywords.gperf" + {"nesw-resize", CSSValueNeswResize}, +#line 267 "CSSValueKeywords.gperf" + {"no-open-quote", CSSValueNoOpenQuote}, +#line 539 "CSSValueKeywords.gperf" + {"use-script", CSSValueUseScript}, +#line 405 "CSSValueKeywords.gperf" + {"darkblue", CSSValueDarkblue}, +#line 291 "CSSValueKeywords.gperf" + {"inline-axis", CSSValueInlineAxis}, +#line 352 "CSSValueKeywords.gperf" + {"searchfield", CSSValueSearchfield}, +#line 381 "CSSValueKeywords.gperf" + {"visiblepainted", CSSValueVisiblepainted}, +#line 254 "CSSValueKeywords.gperf" + {"fixed", CSSValueFixed}, +#line 442 "CSSValueKeywords.gperf" + {"khaki", CSSValueKhaki}, +#line 412 "CSSValueKeywords.gperf" + {"darkmagenta", CSSValueDarkmagenta}, #line 103 "CSSValueKeywords.gperf" {"captiontext", CSSValueCaptiontext}, -#line 223 "CSSValueKeywords.gperf" - {"ew-resize", CSSValueEwResize}, -#line 220 "CSSValueKeywords.gperf" - {"sw-resize", CSSValueSwResize}, -#line 61 "CSSValueKeywords.gperf" - {"ultra-condensed", CSSValueUltraCondensed}, -#line 206 "CSSValueKeywords.gperf" - {"vertical-text", CSSValueVerticalText}, +#line 515 "CSSValueKeywords.gperf" + {"yellowgreen", CSSValueYellowgreen}, #line 486 "CSSValueKeywords.gperf" - {"powderblue", CSSValuePowderblue}, -#line 111 "CSSValueKeywords.gperf" - {"infotext", CSSValueInfotext}, -#line 534 "CSSValueKeywords.gperf" - {"no-change", CSSValueNoChange}, -#line 217 "CSSValueKeywords.gperf" - {"nw-resize", CSSValueNwResize}, -#line 463 "CSSValueKeywords.gperf" - {"mediumseagreen", CSSValueMediumseagreen}, -#line 443 "CSSValueKeywords.gperf" - {"lightcyan", CSSValueLightcyan}, -#line 155 "CSSValueKeywords.gperf" - {"right", CSSValueRight}, -#line 455 "CSSValueKeywords.gperf" - {"lightyellow", CSSValueLightyellow}, -#line 39 "CSSValueKeywords.gperf" - {"lighter", CSSValueLighter}, -#line 459 "CSSValueKeywords.gperf" - {"mediumaquamarine", CSSValueMediumaquamarine}, -#line 292 "CSSValueKeywords.gperf" - {"block-axis", CSSValueBlockAxis}, -#line 147 "CSSValueKeywords.gperf" - {"super", CSSValueSuper}, -#line 321 "CSSValueKeywords.gperf" - {"break-word", CSSValueBreakWord}, -#line 442 "CSSValueKeywords.gperf" - {"lightcoral", CSSValueLightcoral}, -#line 480 "CSSValueKeywords.gperf" {"palevioletred", CSSValuePalevioletred}, -#line 237 "CSSValueKeywords.gperf" - {"capitalize", CSSValueCapitalize}, -#line 375 "CSSValueKeywords.gperf" - {"visiblepainted", CSSValueVisiblepainted}, -#line 179 "CSSValueKeywords.gperf" - {"hiragana", CSSValueHiragana}, -#line 269 "CSSValueKeywords.gperf" - {"open-quote", CSSValueOpenQuote}, -#line 481 "CSSValueKeywords.gperf" +#line 487 "CSSValueKeywords.gperf" {"papayawhip", CSSValuePapayawhip}, -#line 399 "CSSValueKeywords.gperf" - {"darkblue", CSSValueDarkblue}, -#line 475 "CSSValueKeywords.gperf" - {"orangered", CSSValueOrangered}, +#line 492 "CSSValueKeywords.gperf" + {"powderblue", CSSValuePowderblue}, +#line 78 "CSSValueKeywords.gperf" + {"fuchsia", CSSValueFuchsia}, +#line 409 "CSSValueKeywords.gperf" + {"darkgreen", CSSValueDarkgreen}, +#line 100 "CSSValueKeywords.gperf" + {"buttonhighlight", CSSValueButtonhighlight}, +#line 418 "CSSValueKeywords.gperf" + {"darkseagreen", CSSValueDarkseagreen}, +#line 419 "CSSValueKeywords.gperf" + {"darkslateblue", CSSValueDarkslateblue}, +#line 414 "CSSValueKeywords.gperf" + {"darkorange", CSSValueDarkorange}, +#line 186 "CSSValueKeywords.gperf" + {"run-in", CSSValueRunIn}, +#line 171 "CSSValueKeywords.gperf" + {"lower-alpha", CSSValueLowerAlpha}, +#line 101 "CSSValueKeywords.gperf" + {"buttonshadow", CSSValueButtonshadow}, +#line 180 "CSSValueKeywords.gperf" + {"katakana", CSSValueKatakana}, +#line 347 "CSSValueKeywords.gperf" + {"slider-horizontal", CSSValueSliderHorizontal}, +#line 134 "CSSValueKeywords.gperf" + {"source-in", CSSValueSourceIn}, +#line 188 "CSSValueKeywords.gperf" + {"inline-block", CSSValueInlineBlock}, +#line 172 "CSSValueKeywords.gperf" + {"lower-latin", CSSValueLowerLatin}, +#line 394 "CSSValueKeywords.gperf" + {"blueviolet", CSSValueBlueviolet}, +#line 136 "CSSValueKeywords.gperf" + {"source-atop", CSSValueSourceAtop}, #line 226 "CSSValueKeywords.gperf" {"nwse-resize", CSSValueNwseResize}, -#line 16 "CSSValueKeywords.gperf" - {"groove", CSSValueGroove}, -#line 432 "CSSValueKeywords.gperf" - {"hotpink", CSSValueHotpink}, -#line 474 "CSSValueKeywords.gperf" - {"olivedrab", CSSValueOlivedrab}, -#line 427 "CSSValueKeywords.gperf" - {"ghostwhite", CSSValueGhostwhite}, -#line 498 "CSSValueKeywords.gperf" - {"slategrey", CSSValueSlategrey}, #line 497 "CSSValueKeywords.gperf" - {"slategray", CSSValueSlategray}, -#line 137 "CSSValueKeywords.gperf" - {"destination-over", CSSValueDestinationOver}, -#line 54 "CSSValueKeywords.gperf" - {"x-large", CSSValueXLarge}, -#line 505 "CSSValueKeywords.gperf" - {"turquoise", CSSValueTurquoise}, -#line 26 "CSSValueKeywords.gperf" - {"message-box", CSSValueMessageBox}, -#line 467 "CSSValueKeywords.gperf" - {"mediumvioletred", CSSValueMediumvioletred}, -#line 158 "CSSValueKeywords.gperf" - {"-webkit-left", CSSValueWebkitLeft}, -#line 410 "CSSValueKeywords.gperf" + {"sandybrown", CSSValueSandybrown}, +#line 208 "CSSValueKeywords.gperf" + {"context-menu", CSSValueContextMenu}, +#line 168 "CSSValueKeywords.gperf" + {"lower-roman", CSSValueLowerRoman}, +#line 344 "CSSValueKeywords.gperf" + {"menulist-button", CSSValueMenulistButton}, +#line 319 "CSSValueKeywords.gperf" + {"skip-white-space", CSSValueSkipWhiteSpace}, +#line 55 "CSSValueKeywords.gperf" + {"xx-large", CSSValueXxLarge}, +#line 338 "CSSValueKeywords.gperf" + {"media-slider", CSSValueMediaSlider}, +#line 366 "CSSValueKeywords.gperf" + {"content-box", CSSValueContentBox}, +#line 457 "CSSValueKeywords.gperf" + {"lightskyblue", CSSValueLightskyblue}, +#line 315 "CSSValueKeywords.gperf" + {"dot-dash", CSSValueDotDash}, +#line 531 "CSSValueKeywords.gperf" + {"after-edge", CSSValueAfterEdge}, +#line 135 "CSSValueKeywords.gperf" + {"source-out", CSSValueSourceOut}, +#line 228 "CSSValueKeywords.gperf" + {"row-resize", CSSValueRowResize}, +#line 383 "CSSValueKeywords.gperf" + {"visiblestroke", CSSValueVisiblestroke}, +#line 416 "CSSValueKeywords.gperf" {"darkred", CSSValueDarkred}, -#line 413 "CSSValueKeywords.gperf" - {"darkslateblue", CSSValueDarkslateblue}, -#line 419 "CSSValueKeywords.gperf" - {"deepskyblue", CSSValueDeepskyblue}, -#line 441 "CSSValueKeywords.gperf" - {"lightblue", CSSValueLightblue}, -#line 388 "CSSValueKeywords.gperf" - {"blueviolet", CSSValueBlueviolet}, -#line 438 "CSSValueKeywords.gperf" - {"lavenderblush", CSSValueLavenderblush}, -#line 436 "CSSValueKeywords.gperf" - {"khaki", CSSValueKhaki}, -#line 238 "CSSValueKeywords.gperf" - {"uppercase", CSSValueUppercase}, -#line 339 "CSSValueKeywords.gperf" - {"media-sliderthumb", CSSValueMediaSliderthumb}, -#line 479 "CSSValueKeywords.gperf" - {"paleturquoise", CSSValuePaleturquoise}, -#line 429 "CSSValueKeywords.gperf" - {"goldenrod", CSSValueGoldenrod}, -#line 426 "CSSValueKeywords.gperf" - {"gainsboro", CSSValueGainsboro}, -#line 519 "CSSValueKeywords.gperf" - {"geometricprecision", CSSValueGeometricprecision}, -#line 382 "CSSValueKeywords.gperf" - {"antiquewhite", CSSValueAntiquewhite}, -#line 529 "CSSValueKeywords.gperf" - {"ideographic", CSSValueIdeographic}, -#line 316 "CSSValueKeywords.gperf" - {"dot-dot-dash", CSSValueDotDotDash}, -#line 454 "CSSValueKeywords.gperf" - {"lightsteelblue", CSSValueLightsteelblue}, -#line 109 "CSSValueKeywords.gperf" - {"inactivecaptiontext", CSSValueInactivecaptiontext}, +#line 107 "CSSValueKeywords.gperf" + {"inactiveborder", CSSValueInactiveborder}, #line 102 "CSSValueKeywords.gperf" {"buttontext", CSSValueButtontext}, -#line 515 "CSSValueKeywords.gperf" - {"linearrgb", CSSValueLinearrgb}, -#line 466 "CSSValueKeywords.gperf" - {"mediumturquoise", CSSValueMediumturquoise}, -#line 439 "CSSValueKeywords.gperf" - {"lawngreen", CSSValueLawngreen}, -#line 228 "CSSValueKeywords.gperf" - {"row-resize", CSSValueRowResize}, -#line 421 "CSSValueKeywords.gperf" - {"dimgrey", CSSValueDimgrey}, -#line 420 "CSSValueKeywords.gperf" - {"dimgray", CSSValueDimgray}, #line 104 "CSSValueKeywords.gperf" {"graytext", CSSValueGraytext}, -#line 67 "CSSValueKeywords.gperf" - {"extra-expanded", CSSValueExtraExpanded}, -#line 55 "CSSValueKeywords.gperf" - {"xx-large", CSSValueXxLarge}, -#line 422 "CSSValueKeywords.gperf" - {"dodgerblue", CSSValueDodgerblue}, -#line 296 "CSSValueKeywords.gperf" - {"backwards", CSSValueBackwards}, -#line 516 "CSSValueKeywords.gperf" - {"optimizespeed", CSSValueOptimizespeed}, +#line 378 "CSSValueKeywords.gperf" + {"ease-in-out", CSSValueEaseInOut}, +#line 138 "CSSValueKeywords.gperf" + {"destination-in", CSSValueDestinationIn}, +#line 415 "CSSValueKeywords.gperf" + {"darkorchid", CSSValueDarkorchid}, +#line 143 "CSSValueKeywords.gperf" + {"plus-lighter", CSSValuePlusLighter}, +#line 473 "CSSValueKeywords.gperf" + {"mediumvioletred", CSSValueMediumvioletred}, +#line 97 "CSSValueKeywords.gperf" + {"appworkspace", CSSValueAppworkspace}, +#line 140 "CSSValueKeywords.gperf" + {"destination-atop", CSSValueDestinationAtop}, +#line 324 "CSSValueKeywords.gperf" + {"checkbox", CSSValueCheckbox}, +#line 110 "CSSValueKeywords.gperf" + {"infobackground", CSSValueInfobackground}, +#line 326 "CSSValueKeywords.gperf" + {"push-button", CSSValuePushButton}, +#line 320 "CSSValueKeywords.gperf" + {"break-all", CSSValueBreakAll}, +#line 529 "CSSValueKeywords.gperf" + {"optimizelegibility", CSSValueOptimizelegibility}, +#line 109 "CSSValueKeywords.gperf" + {"inactivecaptiontext", CSSValueInactivecaptiontext}, +#line 157 "CSSValueKeywords.gperf" + {"justify", CSSValueJustify}, +#line 173 "CSSValueKeywords.gperf" + {"upper-alpha", CSSValueUpperAlpha}, +#line 349 "CSSValueKeywords.gperf" + {"sliderthumb-horizontal", CSSValueSliderthumbHorizontal}, +#line 424 "CSSValueKeywords.gperf" + {"deeppink", CSSValueDeeppink}, +#line 139 "CSSValueKeywords.gperf" + {"destination-out", CSSValueDestinationOut}, +#line 61 "CSSValueKeywords.gperf" + {"ultra-condensed", CSSValueUltraCondensed}, +#line 406 "CSSValueKeywords.gperf" + {"darkcyan", CSSValueDarkcyan}, #line 174 "CSSValueKeywords.gperf" {"upper-latin", CSSValueUpperLatin}, -#line 68 "CSSValueKeywords.gperf" - {"ultra-expanded", CSSValueUltraExpanded}, -#line 477 "CSSValueKeywords.gperf" - {"palegoldenrod", CSSValuePalegoldenrod}, -#line 345 "CSSValueKeywords.gperf" - {"slider-vertical", CSSValueSliderVertical}, -#line 366 "CSSValueKeywords.gperf" - {"running", CSSValueRunning}, -#line 257 "CSSValueKeywords.gperf" - {"higher", CSSValueHigher}, -#line 180 "CSSValueKeywords.gperf" - {"katakana", CSSValueKatakana}, -#line 153 "CSSValueKeywords.gperf" - {"-webkit-auto", CSSValueWebkitAuto}, +#line 148 "CSSValueKeywords.gperf" + {"text-top", CSSValueTextTop}, +#line 296 "CSSValueKeywords.gperf" + {"backwards", CSSValueBackwards}, +#line 423 "CSSValueKeywords.gperf" + {"darkviolet", CSSValueDarkviolet}, +#line 357 "CSSValueKeywords.gperf" + {"textfield", CSSValueTextfield}, +#line 169 "CSSValueKeywords.gperf" + {"upper-roman", CSSValueUpperRoman}, #line 327 "CSSValueKeywords.gperf" {"square-button", CSSValueSquareButton}, -#line 417 "CSSValueKeywords.gperf" - {"darkviolet", CSSValueDarkviolet}, -#line 326 "CSSValueKeywords.gperf" - {"push-button", CSSValuePushButton}, -#line 528 "CSSValueKeywords.gperf" - {"text-after-edge", CSSValueTextAfterEdge}, -#line 284 "CSSValueKeywords.gperf" - {"-webkit-nowrap", CSSValueWebkitNowrap}, -#line 160 "CSSValueKeywords.gperf" - {"-webkit-center", CSSValueWebkitCenter}, -#line 107 "CSSValueKeywords.gperf" - {"inactiveborder", CSSValueInactiveborder}, -#line 350 "CSSValueKeywords.gperf" - {"searchfield-decoration", CSSValueSearchfieldDecoration}, -#line 101 "CSSValueKeywords.gperf" - {"buttonshadow", CSSValueButtonshadow}, +#line 339 "CSSValueKeywords.gperf" + {"media-sliderthumb", CSSValueMediaSliderthumb}, +#line 64 "CSSValueKeywords.gperf" + {"semi-condensed", CSSValueSemiCondensed}, +#line 66 "CSSValueKeywords.gperf" + {"expanded", CSSValueExpanded}, +#line 323 "CSSValueKeywords.gperf" + {"after-white-space", CSSValueAfterWhiteSpace}, +#line 306 "CSSValueKeywords.gperf" + {"read-write", CSSValueReadWrite}, +#line 95 "CSSValueKeywords.gperf" + {"activeborder", CSSValueActiveborder}, +#line 345 "CSSValueKeywords.gperf" + {"menulist-text", CSSValueMenulistText}, +#line 396 "CSSValueKeywords.gperf" + {"burlywood", CSSValueBurlywood}, +#line 523 "CSSValueKeywords.gperf" + {"optimizequality", CSSValueOptimizequality}, +#line 450 "CSSValueKeywords.gperf" + {"lightgoldenrodyellow", CSSValueLightgoldenrodyellow}, +#line 422 "CSSValueKeywords.gperf" + {"darkturquoise", CSSValueDarkturquoise}, +#line 530 "CSSValueKeywords.gperf" + {"before-edge", CSSValueBeforeEdge}, +#line 26 "CSSValueKeywords.gperf" + {"message-box", CSSValueMessageBox}, +#line 348 "CSSValueKeywords.gperf" + {"slider-vertical", CSSValueSliderVertical}, +#line 149 "CSSValueKeywords.gperf" + {"text-bottom", CSSValueTextBottom}, +#line 269 "CSSValueKeywords.gperf" + {"open-quote", CSSValueOpenQuote}, +#line 178 "CSSValueKeywords.gperf" + {"cjk-ideographic", CSSValueCjkIdeographic}, +#line 98 "CSSValueKeywords.gperf" + {"background", CSSValueBackground}, +#line 410 "CSSValueKeywords.gperf" + {"darkgrey", CSSValueDarkgrey}, +#line 195 "CSSValueKeywords.gperf" + {"table-column-group", CSSValueTableColumnGroup}, +#line 408 "CSSValueKeywords.gperf" + {"darkgray", CSSValueDarkgray}, +#line 340 "CSSValueKeywords.gperf" + {"media-timeline-container", CSSValueMediaTimelineContainer}, +#line 365 "CSSValueKeywords.gperf" + {"border-box", CSSValueBorderBox}, +#line 330 "CSSValueKeywords.gperf" + {"default-button", CSSValueDefaultButton}, +#line 292 "CSSValueKeywords.gperf" + {"block-axis", CSSValueBlockAxis}, #line 247 "CSSValueKeywords.gperf" {"bidi-override", CSSValueBidiOverride}, -#line 30 "CSSValueKeywords.gperf" - {"-webkit-control", CSSValueWebkitControl}, -#line 353 "CSSValueKeywords.gperf" - {"searchfield-cancel-button", CSSValueSearchfieldCancelButton}, -#line 448 "CSSValueKeywords.gperf" - {"lightpink", CSSValueLightpink}, -#line 527 "CSSValueKeywords.gperf" - {"text-before-edge", CSSValueTextBeforeEdge}, +#line 115 "CSSValueKeywords.gperf" + {"threeddarkshadow", CSSValueThreeddarkshadow}, +#line 413 "CSSValueKeywords.gperf" + {"darkolivegreen", CSSValueDarkolivegreen}, +#line 191 "CSSValueKeywords.gperf" + {"table-row-group", CSSValueTableRowGroup}, +#line 421 "CSSValueKeywords.gperf" + {"darkslategrey", CSSValueDarkslategrey}, +#line 420 "CSSValueKeywords.gperf" + {"darkslategray", CSSValueDarkslategray}, +#line 364 "CSSValueKeywords.gperf" + {"padding-box", CSSValuePaddingBox}, +#line 373 "CSSValueKeywords.gperf" + {"preserve-3d", CSSValuePreserve3d}, #line 133 "CSSValueKeywords.gperf" {"source-over", CSSValueSourceOver}, -#line 169 "CSSValueKeywords.gperf" - {"upper-roman", CSSValueUpperRoman}, -#line 177 "CSSValueKeywords.gperf" - {"georgian", CSSValueGeorgian}, -#line 468 "CSSValueKeywords.gperf" - {"midnightblue", CSSValueMidnightblue}, -#line 29 "CSSValueKeywords.gperf" - {"-webkit-small-control", CSSValueWebkitSmallControl}, -#line 406 "CSSValueKeywords.gperf" - {"darkmagenta", CSSValueDarkmagenta}, -#line 330 "CSSValueKeywords.gperf" - {"default-button", CSSValueDefaultButton}, -#line 126 "CSSValueKeywords.gperf" - {"-webkit-text", CSSValueWebkitText}, +#line 128 "CSSValueKeywords.gperf" + {"repeat-x", CSSValueRepeatX}, +#line 334 "CSSValueKeywords.gperf" + {"media-mute-button", CSSValueMediaMuteButton}, +#line 407 "CSSValueKeywords.gperf" + {"darkgoldenrod", CSSValueDarkgoldenrod}, +#line 129 "CSSValueKeywords.gperf" + {"repeat-y", CSSValueRepeatY}, +#line 182 "CSSValueKeywords.gperf" + {"katakana-iroha", CSSValueKatakanaIroha}, +#line 170 "CSSValueKeywords.gperf" + {"lower-greek", CSSValueLowerGreek}, +#line 305 "CSSValueKeywords.gperf" + {"read-only", CSSValueReadOnly}, +#line 350 "CSSValueKeywords.gperf" + {"sliderthumb-vertical", CSSValueSliderthumbVertical}, +#line 321 "CSSValueKeywords.gperf" + {"break-word", CSSValueBreakWord}, +#line 62 "CSSValueKeywords.gperf" + {"extra-condensed", CSSValueExtraCondensed}, #line 329 "CSSValueKeywords.gperf" {"button-bevel", CSSValueButtonBevel}, -#line 191 "CSSValueKeywords.gperf" - {"table-row-group", CSSValueTableRowGroup}, -#line 28 "CSSValueKeywords.gperf" - {"-webkit-mini-control", CSSValueWebkitMiniControl}, -#line 195 "CSSValueKeywords.gperf" - {"table-column-group", CSSValueTableColumnGroup}, -#line 409 "CSSValueKeywords.gperf" - {"darkorchid", CSSValueDarkorchid}, -#line 199 "CSSValueKeywords.gperf" - {"-webkit-box", CSSValueWebkitBox}, -#line 95 "CSSValueKeywords.gperf" - {"activeborder", CSSValueActiveborder}, +#line 411 "CSSValueKeywords.gperf" + {"darkkhaki", CSSValueDarkkhaki}, +#line 137 "CSSValueKeywords.gperf" + {"destination-over", CSSValueDestinationOver}, +#line 68 "CSSValueKeywords.gperf" + {"ultra-expanded", CSSValueUltraExpanded}, #line 193 "CSSValueKeywords.gperf" {"table-footer-group", CSSValueTableFooterGroup}, -#line 323 "CSSValueKeywords.gperf" - {"after-white-space", CSSValueAfterWhiteSpace}, -#line 74 "CSSValueKeywords.gperf" - {"-webkit-body", CSSValueWebkitBody}, -#line 97 "CSSValueKeywords.gperf" - {"appworkspace", CSSValueAppworkspace}, -#line 377 "CSSValueKeywords.gperf" - {"visiblestroke", CSSValueVisiblestroke}, -#line 307 "CSSValueKeywords.gperf" - {"read-write-plaintext-only", CSSValueReadWritePlaintextOnly}, -#line 173 "CSSValueKeywords.gperf" - {"upper-alpha", CSSValueUpperAlpha}, -#line 403 "CSSValueKeywords.gperf" - {"darkgreen", CSSValueDarkgreen}, -#line 412 "CSSValueKeywords.gperf" - {"darkseagreen", CSSValueDarkseagreen}, -#line 408 "CSSValueKeywords.gperf" - {"darkorange", CSSValueDarkorange}, +#line 192 "CSSValueKeywords.gperf" + {"table-header-group", CSSValueTableHeaderGroup}, +#line 206 "CSSValueKeywords.gperf" + {"vertical-text", CSSValueVerticalText}, +#line 65 "CSSValueKeywords.gperf" + {"semi-expanded", CSSValueSemiExpanded}, #line 142 "CSSValueKeywords.gperf" {"plus-darker", CSSValuePlusDarker}, +#line 425 "CSSValueKeywords.gperf" + {"deepskyblue", CSSValueDeepskyblue}, +#line 333 "CSSValueKeywords.gperf" + {"media-fullscreen-button", CSSValueMediaFullscreenButton}, +#line 353 "CSSValueKeywords.gperf" + {"searchfield-decoration", CSSValueSearchfieldDecoration}, +#line 346 "CSSValueKeywords.gperf" + {"menulist-textfield", CSSValueMenulistTextfield}, +#line 316 "CSSValueKeywords.gperf" + {"dot-dot-dash", CSSValueDotDotDash}, +#line 335 "CSSValueKeywords.gperf" + {"media-play-button", CSSValueMediaPlayButton}, +#line 67 "CSSValueKeywords.gperf" + {"extra-expanded", CSSValueExtraExpanded}, #line 356 "CSSValueKeywords.gperf" + {"searchfield-cancel-button", CSSValueSearchfieldCancelButton}, +#line 359 "CSSValueKeywords.gperf" {"caps-lock-indicator", CSSValueCapsLockIndicator}, -#line 115 "CSSValueKeywords.gperf" - {"threeddarkshadow", CSSValueThreeddarkshadow}, +#line 153 "CSSValueKeywords.gperf" + {"-webkit-auto", CSSValueWebkitAuto}, +#line 160 "CSSValueKeywords.gperf" + {"-webkit-center", CSSValueWebkitCenter}, +#line 167 "CSSValueKeywords.gperf" + {"decimal-leading-zero", CSSValueDecimalLeadingZero}, +#line 30 "CSSValueKeywords.gperf" + {"-webkit-control", CSSValueWebkitControl}, +#line 355 "CSSValueKeywords.gperf" + {"searchfield-results-button", CSSValueSearchfieldResultsButton}, +#line 284 "CSSValueKeywords.gperf" + {"-webkit-nowrap", CSSValueWebkitNowrap}, +#line 159 "CSSValueKeywords.gperf" + {"-webkit-right", CSSValueWebkitRight}, +#line 534 "CSSValueKeywords.gperf" + {"text-after-edge", CSSValueTextAfterEdge}, +#line 158 "CSSValueKeywords.gperf" + {"-webkit-left", CSSValueWebkitLeft}, +#line 233 "CSSValueKeywords.gperf" + {"-webkit-grab", CSSValueWebkitGrab}, +#line 533 "CSSValueKeywords.gperf" + {"text-before-edge", CSSValueTextBeforeEdge}, +#line 354 "CSSValueKeywords.gperf" + {"searchfield-results-decoration", CSSValueSearchfieldResultsDecoration}, #line 93 "CSSValueKeywords.gperf" {"-webkit-link", CSSValueWebkitLink}, -#line 446 "CSSValueKeywords.gperf" - {"lightgreen", CSSValueLightgreen}, -#line 200 "CSSValueKeywords.gperf" - {"-webkit-inline-box", CSSValueWebkitInlineBox}, -#line 344 "CSSValueKeywords.gperf" - {"slider-horizontal", CSSValueSliderHorizontal}, -#line 450 "CSSValueKeywords.gperf" - {"lightseagreen", CSSValueLightseagreen}, +#line 264 "CSSValueKeywords.gperf" + {"-webkit-marquee", CSSValueWebkitMarquee}, +#line 126 "CSSValueKeywords.gperf" + {"-webkit-text", CSSValueWebkitText}, +#line 199 "CSSValueKeywords.gperf" + {"-webkit-box", CSSValueWebkitBox}, +#line 234 "CSSValueKeywords.gperf" + {"-webkit-grabbing", CSSValueWebkitGrabbing}, #line 213 "CSSValueKeywords.gperf" {"-webkit-zoom-in", CSSValueWebkitZoomIn}, -#line 531 "CSSValueKeywords.gperf" - {"hanging", CSSValueHanging}, -#line 152 "CSSValueKeywords.gperf" - {"-webkit-baseline-middle", CSSValueWebkitBaselineMiddle}, -#line 337 "CSSValueKeywords.gperf" - {"media-seek-forward-button", CSSValueMediaSeekForwardButton}, -#line 181 "CSSValueKeywords.gperf" - {"hiragana-iroha", CSSValueHiraganaIroha}, -#line 524 "CSSValueKeywords.gperf" - {"before-edge", CSSValueBeforeEdge}, -#line 404 "CSSValueKeywords.gperf" - {"darkgrey", CSSValueDarkgrey}, -#line 402 "CSSValueKeywords.gperf" - {"darkgray", CSSValueDarkgray}, -#line 336 "CSSValueKeywords.gperf" - {"media-seek-back-button", CSSValueMediaSeekBackButton}, -#line 143 "CSSValueKeywords.gperf" - {"plus-lighter", CSSValuePlusLighter}, -#line 118 "CSSValueKeywords.gperf" - {"threedlightshadow", CSSValueThreedlightshadow}, -#line 525 "CSSValueKeywords.gperf" - {"after-edge", CSSValueAfterEdge}, -#line 415 "CSSValueKeywords.gperf" - {"darkslategrey", CSSValueDarkslategrey}, -#line 414 "CSSValueKeywords.gperf" - {"darkslategray", CSSValueDarkslategray}, -#line 447 "CSSValueKeywords.gperf" - {"lightgrey", CSSValueLightgrey}, -#line 445 "CSSValueKeywords.gperf" - {"lightgray", CSSValueLightgray}, -#line 352 "CSSValueKeywords.gperf" - {"searchfield-results-button", CSSValueSearchfieldResultsButton}, -#line 416 "CSSValueKeywords.gperf" - {"darkturquoise", CSSValueDarkturquoise}, -#line 451 "CSSValueKeywords.gperf" - {"lightskyblue", CSSValueLightskyblue}, -#line 500 "CSSValueKeywords.gperf" - {"springgreen", CSSValueSpringgreen}, -#line 453 "CSSValueKeywords.gperf" - {"lightslategrey", CSSValueLightslategrey}, -#line 452 "CSSValueKeywords.gperf" - {"lightslategray", CSSValueLightslategray}, -#line 351 "CSSValueKeywords.gperf" - {"searchfield-results-decoration", CSSValueSearchfieldResultsDecoration}, -#line 170 "CSSValueKeywords.gperf" - {"lower-greek", CSSValueLowerGreek}, +#line 342 "CSSValueKeywords.gperf" + {"media-time-remaining-display", CSSValueMediaTimeRemainingDisplay}, +#line 341 "CSSValueKeywords.gperf" + {"media-current-time-display", CSSValueMediaCurrentTimeDisplay}, +#line 29 "CSSValueKeywords.gperf" + {"-webkit-small-control", CSSValueWebkitSmallControl}, #line 214 "CSSValueKeywords.gperf" {"-webkit-zoom-out", CSSValueWebkitZoomOut}, -#line 264 "CSSValueKeywords.gperf" - {"-webkit-marquee", CSSValueWebkitMarquee}, -#line 465 "CSSValueKeywords.gperf" - {"mediumspringgreen", CSSValueMediumspringgreen}, -#line 261 "CSSValueKeywords.gperf" - {"line-through", CSSValueLineThrough}, -#line 517 "CSSValueKeywords.gperf" - {"optimizequality", CSSValueOptimizequality}, -#line 182 "CSSValueKeywords.gperf" - {"katakana-iroha", CSSValueKatakanaIroha}, -#line 178 "CSSValueKeywords.gperf" - {"cjk-ideographic", CSSValueCjkIdeographic}, -#line 401 "CSSValueKeywords.gperf" - {"darkgoldenrod", CSSValueDarkgoldenrod}, -#line 167 "CSSValueKeywords.gperf" - {"decimal-leading-zero", CSSValueDecimalLeadingZero}, -#line 192 "CSSValueKeywords.gperf" - {"table-header-group", CSSValueTableHeaderGroup}, -#line 233 "CSSValueKeywords.gperf" - {"-webkit-grab", CSSValueWebkitGrab}, -#line 347 "CSSValueKeywords.gperf" - {"sliderthumb-vertical", CSSValueSliderthumbVertical}, -#line 98 "CSSValueKeywords.gperf" - {"background", CSSValueBackground}, -#line 523 "CSSValueKeywords.gperf" - {"optimizelegibility", CSSValueOptimizelegibility}, -#line 407 "CSSValueKeywords.gperf" - {"darkolivegreen", CSSValueDarkolivegreen}, -#line 105 "CSSValueKeywords.gperf" - {"highlight", CSSValueHighlight}, -#line 405 "CSSValueKeywords.gperf" - {"darkkhaki", CSSValueDarkkhaki}, +#line 28 "CSSValueKeywords.gperf" + {"-webkit-mini-control", CSSValueWebkitMiniControl}, +#line 336 "CSSValueKeywords.gperf" + {"media-seek-back-button", CSSValueMediaSeekBackButton}, +#line 74 "CSSValueKeywords.gperf" + {"-webkit-body", CSSValueWebkitBody}, +#line 337 "CSSValueKeywords.gperf" + {"media-seek-forward-button", CSSValueMediaSeekForwardButton}, #line 94 "CSSValueKeywords.gperf" {"-webkit-activelink", CSSValueWebkitActivelink}, -#line 444 "CSSValueKeywords.gperf" - {"lightgoldenrodyellow", CSSValueLightgoldenrodyellow}, -#line 159 "CSSValueKeywords.gperf" - {"-webkit-right", CSSValueWebkitRight}, -#line 346 "CSSValueKeywords.gperf" - {"sliderthumb-horizontal", CSSValueSliderthumbHorizontal}, -#line 110 "CSSValueKeywords.gperf" - {"infobackground", CSSValueInfobackground}, +#line 200 "CSSValueKeywords.gperf" + {"-webkit-inline-box", CSSValueWebkitInlineBox}, +#line 307 "CSSValueKeywords.gperf" + {"read-write-plaintext-only", CSSValueReadWritePlaintextOnly}, +#line 152 "CSSValueKeywords.gperf" + {"-webkit-baseline-middle", CSSValueWebkitBaselineMiddle}, #line 123 "CSSValueKeywords.gperf" {"-webkit-focus-ring-color", CSSValueWebkitFocusRingColor}, -#line 117 "CSSValueKeywords.gperf" - {"threedhighlight", CSSValueThreedhighlight}, -#line 106 "CSSValueKeywords.gperf" - {"highlighttext", CSSValueHighlighttext}, -#line 234 "CSSValueKeywords.gperf" - {"-webkit-grabbing", CSSValueWebkitGrabbing}, #line 56 "CSSValueKeywords.gperf" - {"-webkit-xxx-large", CSSValueWebkitXxxLarge}, -#line 100 "CSSValueKeywords.gperf" - {"buttonhighlight", CSSValueButtonhighlight} + {"-webkit-xxx-large", CSSValueWebkitXxxLarge} }; static const short lookup[] = { 0, -1, -1, -1, -1, 1, -1, -1, -1, -1, 2, -1, -1, -1, -1, 3, -1, -1, -1, -1, - 4, -1, -1, -1, -1, 5, -1, -1, -1, -1, - 6, -1, -1, -1, -1, 7, -1, -1, -1, -1, - 8, -1, -1, -1, -1, 9, 10, 11, -1, -1, - 12, 13, -1, 14, -1, 15, -1, -1, -1, -1, - 16, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 17, -1, -1, -1, -1, - 18, -1, -1, -1, -1, 19, -1, -1, -1, -1, - -1, -1, 20, -1, -1, 21, -1, 22, -1, -1, - -1, -1, 23, -1, -1, -1, -1, -1, -1, -1, - 24, -1, -1, -1, -1, 25, -1, 26, -1, -1, + 4, -1, 5, -1, -1, 6, 7, -1, -1, -1, + 8, -1, -1, -1, -1, 9, 10, -1, -1, -1, + 11, 12, -1, -1, -1, 13, 14, -1, -1, -1, + 15, 16, -1, -1, -1, 17, -1, -1, -1, -1, + 18, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 19, -1, -1, -1, -1, + 20, 21, -1, -1, -1, 22, 23, -1, -1, -1, + -1, -1, -1, -1, -1, 24, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 25, -1, -1, -1, -1, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 28, -1, -1, -1, -1, 29, -1, -1, -1, -1, - -1, 30, -1, 31, -1, 32, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 33, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 34, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 35, 36, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 37, -1, -1, -1, -1, - -1, -1, -1, 38, -1, -1, -1, -1, -1, -1, - 39, 40, -1, -1, -1, 41, -1, 42, -1, -1, - 43, 44, -1, 45, 46, -1, 47, -1, -1, -1, - -1, 48, -1, -1, -1, 49, 50, -1, -1, -1, - 51, -1, -1, -1, -1, 52, -1, -1, -1, -1, - 53, 54, -1, -1, -1, -1, -1, 55, -1, -1, - 56, -1, -1, -1, -1, 57, 58, -1, -1, -1, - -1, 59, 60, -1, -1, -1, -1, -1, -1, -1, - 61, -1, -1, -1, -1, 62, 63, -1, -1, 64, - 65, 66, 67, -1, -1, -1, 68, -1, -1, -1, - -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 70, -1, -1, -1, - -1, 71, -1, -1, -1, -1, 72, -1, -1, -1, - -1, 73, -1, 74, -1, -1, -1, -1, -1, -1, - -1, 75, -1, -1, -1, -1, -1, -1, -1, -1, - 76, -1, -1, -1, -1, 77, -1, -1, -1, -1, - -1, 78, 79, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 80, -1, 81, -1, -1, - -1, -1, -1, -1, -1, -1, 82, -1, -1, -1, - 83, 84, -1, -1, -1, 85, 86, -1, -1, -1, - 87, -1, -1, 88, -1, 89, 90, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 91, 92, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 93, -1, -1, -1, 94, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 95, -1, -1, 96, -1, -1, -1, -1, - 97, -1, -1, -1, -1, 98, -1, -1, 99, -1, - 100, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 101, -1, -1, -1, -1, 102, -1, 103, -1, - -1, 104, 105, -1, -1, -1, -1, -1, 106, -1, - 107, -1, -1, -1, -1, 108, -1, 109, -1, -1, - -1, 110, -1, -1, -1, 111, -1, 112, -1, -1, - 113, -1, -1, -1, -1, 114, 115, -1, -1, -1, - 116, -1, -1, 117, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 118, -1, -1, -1, -1, - 119, -1, -1, -1, -1, -1, 120, -1, -1, -1, - -1, -1, -1, -1, -1, 121, -1, -1, -1, -1, - 122, 123, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 124, -1, -1, -1, -1, -1, -1, -1, 125, - 126, 127, 128, 129, -1, -1, -1, -1, -1, -1, - 130, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 131, -1, 132, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 133, -1, 134, 135, -1, -1, -1, - -1, -1, -1, -1, -1, 136, -1, -1, 137, -1, - -1, -1, -1, 138, -1, -1, -1, -1, -1, -1, - -1, 139, -1, 140, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 141, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 142, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 143, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 144, -1, - -1, 145, 146, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 147, -1, -1, 148, -1, -1, 149, -1, - 150, -1, -1, -1, -1, 151, 152, 153, -1, -1, - -1, 154, -1, -1, -1, 155, 156, -1, -1, -1, - -1, 157, -1, -1, -1, 158, 159, -1, -1, -1, - -1, -1, 160, -1, -1, 161, -1, -1, -1, -1, - 162, 163, -1, -1, -1, -1, -1, -1, -1, -1, - 164, 165, 166, -1, -1, 167, 168, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 169, -1, -1, -1, - 170, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 171, 172, -1, -1, -1, -1, - 173, -1, -1, -1, -1, -1, 174, -1, -1, -1, - 175, 176, 177, -1, -1, 178, 179, 180, -1, -1, - -1, 181, 182, -1, -1, -1, -1, -1, -1, -1, - 183, 184, -1, -1, -1, -1, 185, -1, -1, -1, - 186, 187, 188, -1, 189, -1, -1, 190, -1, -1, - 191, -1, -1, -1, -1, 192, 193, -1, -1, -1, - 194, -1, -1, -1, -1, -1, -1, 195, -1, -1, - -1, -1, -1, -1, -1, -1, 196, -1, 197, -1, - -1, -1, -1, -1, -1, 198, 199, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 200, -1, -1, -1, - -1, 201, -1, -1, -1, -1, 202, -1, -1, -1, - -1, -1, -1, -1, -1, 203, -1, 204, -1, -1, - -1, 205, -1, -1, -1, -1, -1, -1, 206, -1, - -1, -1, -1, -1, -1, 207, 208, -1, -1, -1, - 209, -1, 210, -1, -1, 211, -1, 212, -1, -1, - -1, -1, -1, -1, -1, 213, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 214, -1, -1, -1, -1, - -1, 215, -1, -1, -1, 216, -1, -1, -1, -1, - -1, 217, -1, -1, -1, -1, 218, -1, -1, -1, - 219, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 220, 221, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 222, 223, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 224, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 225, 226, 227, -1, -1, - -1, -1, -1, -1, -1, 228, 229, -1, -1, -1, - -1, 230, -1, -1, -1, 231, -1, 232, 233, -1, - -1, -1, -1, -1, -1, 234, -1, -1, -1, -1, - 235, 236, -1, -1, -1, 237, -1, -1, -1, -1, - 238, 239, -1, -1, -1, 240, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 241, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 242, -1, -1, -1, - -1, -1, -1, -1, -1, 243, 244, -1, 245, -1, - -1, -1, -1, -1, -1, 246, 247, -1, -1, -1, - -1, -1, -1, 248, -1, -1, -1, -1, 249, -1, - -1, -1, -1, -1, -1, 250, 251, 252, -1, -1, - 253, -1, -1, -1, -1, 254, -1, -1, -1, -1, - 255, 256, -1, 257, -1, -1, -1, 258, -1, -1, - 259, 260, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 261, -1, - 262, -1, -1, -1, -1, -1, 263, -1, 264, -1, - 265, 266, 267, -1, -1, -1, 268, 269, -1, -1, - -1, 270, -1, -1, -1, -1, -1, -1, -1, -1, + 28, 29, -1, -1, -1, 30, 31, -1, -1, -1, + -1, -1, -1, -1, -1, 32, -1, -1, -1, -1, + 33, -1, -1, -1, -1, 34, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 35, 36, -1, -1, + 37, -1, 38, -1, -1, -1, 39, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 40, -1, -1, -1, + -1, 41, -1, -1, -1, 42, 43, 44, -1, -1, + -1, 45, -1, 46, -1, 47, -1, -1, -1, -1, + -1, 48, -1, -1, 49, -1, -1, -1, -1, -1, + -1, 50, -1, -1, -1, 51, 52, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 53, -1, 54, -1, -1, 55, -1, -1, -1, -1, + 56, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 57, -1, -1, -1, 58, -1, 59, -1, -1, + 60, -1, -1, 61, -1, 62, -1, -1, -1, -1, + 63, -1, 64, 65, -1, -1, 66, 67, -1, -1, + 68, -1, -1, -1, -1, 69, 70, -1, -1, -1, + -1, 71, -1, 72, -1, -1, -1, -1, -1, -1, + -1, -1, 73, 74, -1, 75, 76, -1, -1, -1, + -1, -1, -1, 77, -1, -1, -1, -1, -1, -1, + -1, 78, -1, -1, -1, 79, 80, -1, -1, -1, + 81, -1, -1, -1, -1, 82, 83, -1, -1, -1, + 84, 85, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 86, -1, 87, -1, -1, -1, 88, -1, -1, -1, + -1, 89, -1, -1, -1, 90, -1, -1, -1, -1, + -1, 91, 92, -1, -1, 93, 94, 95, -1, -1, + -1, 96, -1, -1, 97, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 98, -1, 99, -1, -1, 100, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 101, -1, -1, -1, -1, + -1, 102, -1, -1, -1, -1, 103, -1, -1, -1, + 104, -1, 105, -1, -1, 106, 107, -1, -1, -1, + 108, -1, 109, -1, -1, -1, -1, 110, 111, -1, + -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, + 113, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 114, -1, -1, -1, + 115, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 116, -1, -1, -1, + -1, -1, -1, -1, -1, 117, 118, -1, -1, -1, + 119, -1, -1, -1, -1, 120, -1, -1, -1, -1, + -1, -1, -1, -1, 121, -1, -1, -1, -1, -1, + -1, -1, -1, 122, 123, -1, 124, -1, -1, -1, + 125, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 126, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 127, -1, -1, -1, + -1, 128, -1, -1, -1, -1, 129, -1, -1, -1, + 130, -1, -1, -1, -1, 131, -1, -1, -1, -1, + 132, -1, 133, -1, -1, -1, -1, -1, -1, -1, + 134, -1, -1, -1, 135, -1, -1, -1, -1, -1, + 136, -1, -1, -1, -1, 137, -1, -1, -1, -1, + -1, 138, -1, -1, -1, 139, -1, -1, -1, -1, + 140, -1, -1, -1, -1, -1, 141, -1, 142, -1, + 143, -1, -1, -1, -1, 144, -1, -1, -1, -1, + 145, 146, -1, -1, -1, -1, 147, -1, -1, -1, + 148, -1, -1, -1, -1, 149, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 150, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 151, -1, -1, -1, -1, + 152, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 153, -1, -1, -1, + -1, 154, -1, -1, -1, -1, 155, -1, -1, -1, + 156, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 157, -1, 158, 159, 160, 161, -1, + 162, 163, -1, -1, -1, 164, -1, -1, -1, -1, + -1, 165, -1, -1, -1, 166, -1, -1, -1, -1, + 167, 168, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 169, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 170, -1, -1, + -1, -1, 171, -1, -1, 172, 173, -1, -1, -1, + -1, 174, -1, -1, -1, 175, -1, 176, -1, -1, + -1, 177, -1, -1, -1, 178, 179, 180, -1, -1, + 181, 182, -1, 183, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 184, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 185, 186, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 187, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 188, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 189, -1, -1, -1, -1, -1, 190, -1, -1, + 191, -1, -1, -1, -1, -1, 192, -1, -1, -1, + 193, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 194, 195, -1, -1, 196, -1, -1, -1, -1, + 197, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 198, -1, -1, -1, -1, + -1, 199, -1, -1, -1, 200, -1, 201, -1, -1, + 202, -1, 203, -1, -1, -1, 204, -1, -1, -1, + -1, -1, -1, -1, -1, 205, -1, -1, -1, -1, + 206, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 207, -1, -1, -1, -1, + 208, -1, 209, -1, -1, 210, -1, 211, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 212, 213, 214, -1, -1, -1, 215, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 216, -1, -1, -1, -1, 217, 218, -1, -1, -1, + 219, -1, -1, -1, -1, 220, 221, -1, -1, -1, + 222, -1, -1, -1, -1, -1, 223, -1, 224, -1, + 225, 226, -1, -1, 227, -1, 228, -1, -1, -1, + 229, 230, -1, -1, -1, -1, -1, -1, -1, -1, + 231, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 232, -1, -1, -1, -1, 233, 234, -1, -1, -1, + 235, -1, 236, -1, -1, -1, -1, -1, -1, -1, + 237, 238, -1, -1, -1, 239, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 240, 241, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 242, 243, -1, -1, -1, + -1, 244, 245, -1, -1, -1, -1, 246, -1, -1, + -1, -1, -1, 247, -1, -1, -1, -1, -1, -1, + 248, 249, -1, -1, -1, -1, 250, -1, -1, -1, + -1, 251, 252, -1, -1, 253, 254, -1, -1, -1, + 255, -1, 256, -1, -1, 257, -1, -1, -1, -1, + -1, 258, -1, -1, -1, -1, -1, -1, -1, -1, + 259, -1, -1, -1, -1, 260, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 261, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 262, -1, -1, + 263, 264, -1, -1, -1, -1, -1, 265, -1, -1, + -1, -1, -1, -1, -1, 266, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 267, -1, -1, 268, -1, 269, 270, -1, -1, -1, -1, -1, -1, -1, -1, 271, -1, -1, -1, -1, - 272, -1, 273, -1, -1, 274, -1, -1, 275, -1, - 276, -1, 277, 278, -1, 279, -1, 280, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 281, -1, 282, -1, -1, 283, 284, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 285, -1, -1, 286, -1, 287, -1, -1, -1, -1, - 288, 289, -1, 290, -1, 291, 292, -1, -1, 293, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 294, -1, 295, -1, -1, -1, -1, -1, -1, - -1, 296, -1, -1, -1, -1, -1, -1, 297, -1, - 298, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 299, -1, -1, -1, -1, -1, 300, -1, -1, -1, - -1, -1, 301, -1, -1, 302, -1, -1, 303, -1, - 304, -1, -1, -1, -1, 305, -1, -1, -1, -1, - 306, 307, 308, -1, -1, 309, -1, -1, -1, -1, - -1, -1, 310, -1, -1, 311, -1, -1, -1, -1, - -1, 312, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 313, 314, -1, -1, -1, - -1, -1, 315, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 316, -1, -1, -1, -1, -1, -1, - 317, -1, -1, -1, -1, -1, 318, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 319, -1, 320, -1, -1, -1, 321, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 322, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 323, 324, -1, 325, -1, - -1, -1, -1, -1, -1, -1, 326, -1, -1, -1, + -1, 272, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 273, -1, -1, -1, -1, -1, -1, 274, -1, + -1, 275, -1, -1, -1, 276, 277, 278, -1, -1, + -1, -1, -1, -1, -1, 279, -1, -1, -1, -1, + -1, 280, -1, -1, -1, 281, -1, -1, -1, -1, + 282, -1, -1, -1, -1, 283, 284, -1, -1, -1, + -1, 285, -1, -1, -1, 286, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 287, 288, -1, -1, + -1, 289, -1, -1, -1, 290, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 291, 292, -1, -1, -1, + 293, -1, -1, -1, -1, 294, -1, 295, -1, -1, + -1, -1, -1, -1, -1, 296, -1, -1, -1, -1, + 297, -1, -1, -1, 298, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 299, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 300, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 301, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 302, -1, 303, -1, 304, -1, -1, -1, -1, + 305, -1, -1, -1, -1, -1, 306, -1, -1, -1, + -1, 307, -1, -1, -1, 308, -1, -1, -1, -1, + 309, -1, -1, -1, -1, 310, -1, -1, -1, -1, + 311, -1, -1, -1, -1, 312, -1, -1, -1, -1, + -1, -1, 313, -1, -1, -1, -1, -1, -1, -1, + -1, 314, -1, -1, -1, -1, 315, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 316, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 317, + -1, -1, 318, -1, -1, -1, -1, 319, -1, -1, + -1, -1, 320, -1, -1, -1, 321, -1, -1, -1, + -1, -1, 322, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 323, -1, -1, -1, + -1, 324, 325, -1, -1, 326, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 327, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 328, 329, -1, -1, -1, - -1, 330, -1, -1, -1, -1, -1, -1, -1, -1, - 331, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 332, -1, 333, -1, -1, 334, -1, -1, -1, - -1, -1, -1, -1, -1, 335, 336, -1, -1, -1, - 337, -1, -1, -1, -1, -1, -1, 338, -1, -1, - -1, 339, -1, -1, -1, -1, 340, 341, -1, -1, - -1, -1, -1, -1, -1, 342, -1, 343, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 344, 345, -1, 346, -1, 347, -1, -1, -1, -1, - 348, -1, -1, -1, -1, -1, -1, -1, -1, 349, - 350, 351, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 352, 353, 354, -1, -1, -1, -1, 355, -1, - 356, -1, -1, -1, -1, -1, -1, 357, -1, -1, - -1, -1, -1, -1, -1, -1, 358, -1, -1, -1, - -1, 359, 360, 361, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 362, 363, -1, -1, -1, -1, -1, -1, -1, - -1, 364, -1, -1, 365, -1, -1, -1, -1, -1, - -1, 366, 367, -1, -1, -1, 368, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 369, -1, -1, -1, - -1, -1, -1, 370, -1, -1, -1, -1, -1, -1, - -1, 371, -1, -1, -1, 372, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 373, -1, -1, -1, -1, 374, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 375, -1, 376, 377, - -1, -1, -1, -1, -1, 378, -1, -1, -1, -1, - 379, -1, -1, -1, -1, -1, 380, -1, -1, -1, - 381, -1, -1, -1, -1, 382, 383, -1, -1, -1, - -1, -1, 384, -1, -1, -1, -1, -1, -1, -1, - -1, 385, -1, -1, -1, -1, 386, -1, -1, -1, - -1, 387, -1, 388, -1, -1, 389, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 390, -1, -1, - -1, 391, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 392, -1, - 393, -1, -1, -1, -1, 394, -1, -1, 395, -1, - -1, 396, -1, -1, -1, 397, -1, 398, -1, -1, - 399, -1, -1, -1, -1, -1, -1, 400, -1, -1, - -1, 401, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 402, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 403, -1, -1, -1, -1, - -1, 404, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 405, -1, -1, -1, - -1, -1, -1, 406, -1, -1, -1, -1, -1, -1, - -1, 407, -1, -1, -1, -1, -1, -1, -1, -1, - 408, -1, -1, -1, -1, -1, 409, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 410, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 411, -1, -1, -1, -1, 412, 413, -1, -1, - -1, 414, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 415, 416, -1, -1, - -1, -1, 417, -1, -1, -1, -1, 418, -1, -1, - -1, -1, 419, -1, -1, -1, -1, -1, -1, 420, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 421, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 422, -1, -1, - -1, 423, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 424, -1, -1, -1, -1, -1, -1, -1, - -1, 425, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 426, 427, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 428, -1, -1, -1, -1, -1, 429, -1, -1, -1, - 430, -1, -1, -1, -1, -1, -1, 431, -1, -1, + 328, -1, -1, 329, -1, 330, 331, -1, -1, -1, + 332, -1, -1, -1, -1, 333, 334, -1, -1, -1, + -1, 335, 336, -1, -1, -1, -1, -1, -1, -1, + 337, -1, -1, -1, -1, 338, -1, 339, -1, -1, + -1, -1, -1, -1, -1, -1, 340, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 341, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 342, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 343, -1, -1, 344, -1, -1, -1, -1, -1, + -1, 345, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 346, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 347, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 348, 349, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 350, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 351, -1, + -1, 352, -1, -1, -1, -1, 353, -1, -1, -1, + 354, 355, -1, -1, -1, 356, -1, -1, -1, -1, + 357, -1, -1, 358, -1, -1, 359, -1, 360, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 361, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 362, -1, + -1, -1, -1, 363, -1, -1, -1, -1, 364, -1, + -1, -1, -1, -1, -1, -1, 365, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 366, -1, -1, -1, + -1, -1, -1, 367, -1, -1, -1, -1, -1, -1, + 368, -1, -1, -1, -1, 369, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 370, 371, -1, -1, -1, + -1, 372, -1, -1, -1, -1, -1, 373, -1, -1, + 374, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 375, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 376, -1, 377, -1, -1, -1, -1, -1, -1, + 378, -1, -1, -1, 379, 380, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 381, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 382, -1, -1, -1, -1, -1, -1, -1, -1, + 383, 384, -1, -1, -1, 385, 386, -1, -1, -1, + -1, -1, -1, -1, -1, 387, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 388, 389, -1, -1, -1, -1, -1, -1, -1, + 390, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 391, -1, -1, -1, -1, -1, -1, -1, + 392, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 393, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 394, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 395, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 396, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 397, -1, -1, -1, -1, + -1, -1, 398, -1, -1, 399, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 400, -1, -1, -1, -1, 401, -1, -1, -1, -1, + -1, -1, -1, 402, 403, 404, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 405, -1, -1, -1, -1, -1, -1, -1, -1, 406, + -1, 407, 408, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 409, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 410, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 411, -1, -1, -1, + 412, -1, -1, -1, -1, 413, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 414, -1, 415, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 416, -1, -1, -1, -1, 417, -1, -1, -1, -1, + -1, 418, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 419, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 420, -1, -1, -1, -1, -1, -1, -1, 421, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 422, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 423, -1, 424, -1, -1, + -1, 425, -1, -1, -1, 426, -1, -1, 427, -1, + -1, -1, -1, -1, -1, 428, -1, -1, -1, -1, + -1, -1, 429, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 430, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 431, -1, 432, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 433, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 434, -1, -1, -1, -1, + -1, 435, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 436, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 437, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 438, -1, -1, -1, 439, 440, -1, -1, -1, + -1, -1, 441, -1, -1, 442, -1, -1, -1, -1, + -1, 443, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 444, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 445, -1, -1, + -1, -1, -1, 446, -1, -1, 447, -1, -1, -1, + -1, -1, -1, -1, -1, 448, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 449, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 450, -1, -1, -1, -1, -1, 451, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 452, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 453, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 454, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 455, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 433, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 434, -1, -1, -1, -1, -1, -1, -1, 435, -1, - -1, -1, -1, -1, 436, -1, -1, 437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 438, -1, 439, -1, -1, - -1, -1, 440, -1, -1, -1, 441, 442, -1, -1, + -1, 456, -1, -1, -1, -1, 457, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 458, -1, -1, -1, -1, 459, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 460, 461, -1, -1, -1, 462, 463, -1, -1, + 464, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 465, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 466, -1, -1, -1, -1, -1, -1, -1, -1, + 467, 468, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 469, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 443, -1, -1, -1, 444, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 470, -1, -1, -1, + -1, -1, 471, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 445, -1, 446, -1, -1, -1, -1, - -1, -1, 447, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 472, -1, -1, -1, -1, 473, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 448, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 449, 450, -1, -1, - -1, -1, -1, -1, -1, 451, 452, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 453, -1, - -1, -1, -1, -1, -1, 454, -1, -1, -1, -1, - -1, -1, 455, -1, -1, -1, -1, 456, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 457, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 458, -1, -1, 459, -1, - 460, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 474, -1, -1, -1, 475, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 461, 462, -1, -1, -1, -1, -1, 463, -1, - -1, -1, -1, -1, 464, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 465, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 476, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 466, -1, -1, -1, -1, + -1, 477, -1, -1, -1, 478, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 467, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 468, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 469, -1, -1, -1, -1, 470, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 479, 480, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 471, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 472, -1, -1, -1, - -1, -1, 473, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 474, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 475, -1, 476, -1, - -1, 477, -1, -1, -1, -1, 478, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 481, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 479, -1, -1, -1, -1, -1, -1, -1, - 480, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 481, -1, -1, - -1, -1, -1, -1, 482, -1, 483, -1, -1, -1, + -1, 482, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 483, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 484, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 485, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 484, -1, -1, -1, -1, 485, -1, -1, -1, -1, 486, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 487, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 488, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 487, -1, -1, -1, -1, + -1, 488, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 489, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 490, -1, -1, -1, -1, + -1, 491, 492, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 493, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 494, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 489, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 490, -1, -1, -1, -1, -1, 491, -1, -1, -1, - -1, 492, 493, -1, -1, -1, -1, 494, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 495, -1, -1, - -1, -1, -1, -1, -1, -1, 496, -1, -1, -1, - -1, -1, 497, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 495, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 496, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 497, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 498, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 499, -1, -1, -1, -1, 500, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 501, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 499, 500, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 501, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 502, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 503, 504, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 505, -1, -1, -1, - -1, 506, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 507, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1591,40 +1726,120 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 503, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 504, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 505, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 506, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 507, -1, -1, -1, -1, -1, -1, -1, -1, 508, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 509, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 510, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 511, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 512, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 509, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 510, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 513, -1, -1, -1, 514, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 511, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 512, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 513, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 514, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 515, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 516, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 517, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 515, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 516, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 517, 518, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 518, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 519, -1, -1, -1, -1, @@ -1632,36 +1847,47 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 520, -1, 521, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 522, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 520, -1, 521, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 523, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 524, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 525, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 526, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 522, -1, -1, + 527, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 528, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 523, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1672,11 +1898,9 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 524, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 525, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1687,11 +1911,10 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 529, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 526, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 527, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1703,6 +1926,7 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 530, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1718,6 +1942,7 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 531, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1729,11 +1954,11 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 528, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 532, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1745,13 +1970,13 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 529, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 533, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1759,6 +1984,7 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 534, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1792,7 +2018,139 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 530 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 535, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 536 }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -1814,7 +2172,7 @@ findValue (register const char *str, register unsigned int len) } return 0; } -#line 542 "CSSValueKeywords.gperf" +#line 548 "CSSValueKeywords.gperf" static const char * const valueList[] = { "", @@ -2147,6 +2505,9 @@ static const char * const valueList[] = { "media-seek-forward-button", "media-slider", "media-sliderthumb", +"media-timeline-container", +"media-current-time-display", +"media-time-remaining-display", "menulist", "menulist-button", "menulist-text", @@ -2168,6 +2529,7 @@ static const char * const valueList[] = { "border", "content", "padding", +"padding-box", "border-box", "content-box", "logical", @@ -2175,6 +2537,8 @@ static const char * const valueList[] = { "lines", "running", "paused", +"flat", +"preserve-3d", "ease", "linear", "ease-in", diff --git a/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.h b/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.h index 505c95e94f..8b6c66983a 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.h +++ b/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.h @@ -333,209 +333,215 @@ const int CSSValueMediaSeekBackButton = 326; const int CSSValueMediaSeekForwardButton = 327; const int CSSValueMediaSlider = 328; const int CSSValueMediaSliderthumb = 329; -const int CSSValueMenulist = 330; -const int CSSValueMenulistButton = 331; -const int CSSValueMenulistText = 332; -const int CSSValueMenulistTextfield = 333; -const int CSSValueSliderHorizontal = 334; -const int CSSValueSliderVertical = 335; -const int CSSValueSliderthumbHorizontal = 336; -const int CSSValueSliderthumbVertical = 337; -const int CSSValueCaret = 338; -const int CSSValueSearchfield = 339; -const int CSSValueSearchfieldDecoration = 340; -const int CSSValueSearchfieldResultsDecoration = 341; -const int CSSValueSearchfieldResultsButton = 342; -const int CSSValueSearchfieldCancelButton = 343; -const int CSSValueTextfield = 344; -const int CSSValueTextarea = 345; -const int CSSValueCapsLockIndicator = 346; -const int CSSValueRound = 347; -const int CSSValueBorder = 348; -const int CSSValueContent = 349; -const int CSSValuePadding = 350; -const int CSSValueBorderBox = 351; -const int CSSValueContentBox = 352; -const int CSSValueLogical = 353; -const int CSSValueVisual = 354; -const int CSSValueLines = 355; -const int CSSValueRunning = 356; -const int CSSValuePaused = 357; -const int CSSValueEase = 358; -const int CSSValueLinear = 359; -const int CSSValueEaseIn = 360; -const int CSSValueEaseOut = 361; -const int CSSValueEaseInOut = 362; -const int CSSValueDocument = 363; -const int CSSValueReset = 364; -const int CSSValueVisiblepainted = 365; -const int CSSValueVisiblefill = 366; -const int CSSValueVisiblestroke = 367; -const int CSSValuePainted = 368; -const int CSSValueFill = 369; -const int CSSValueStroke = 370; -const int CSSValueAliceblue = 371; -const int CSSValueAntiquewhite = 372; -const int CSSValueAquamarine = 373; -const int CSSValueAzure = 374; -const int CSSValueBeige = 375; -const int CSSValueBisque = 376; -const int CSSValueBlanchedalmond = 377; -const int CSSValueBlueviolet = 378; -const int CSSValueBrown = 379; -const int CSSValueBurlywood = 380; -const int CSSValueCadetblue = 381; -const int CSSValueChartreuse = 382; -const int CSSValueChocolate = 383; -const int CSSValueCoral = 384; -const int CSSValueCornflowerblue = 385; -const int CSSValueCornsilk = 386; -const int CSSValueCrimson = 387; -const int CSSValueCyan = 388; -const int CSSValueDarkblue = 389; -const int CSSValueDarkcyan = 390; -const int CSSValueDarkgoldenrod = 391; -const int CSSValueDarkgray = 392; -const int CSSValueDarkgreen = 393; -const int CSSValueDarkgrey = 394; -const int CSSValueDarkkhaki = 395; -const int CSSValueDarkmagenta = 396; -const int CSSValueDarkolivegreen = 397; -const int CSSValueDarkorange = 398; -const int CSSValueDarkorchid = 399; -const int CSSValueDarkred = 400; -const int CSSValueDarksalmon = 401; -const int CSSValueDarkseagreen = 402; -const int CSSValueDarkslateblue = 403; -const int CSSValueDarkslategray = 404; -const int CSSValueDarkslategrey = 405; -const int CSSValueDarkturquoise = 406; -const int CSSValueDarkviolet = 407; -const int CSSValueDeeppink = 408; -const int CSSValueDeepskyblue = 409; -const int CSSValueDimgray = 410; -const int CSSValueDimgrey = 411; -const int CSSValueDodgerblue = 412; -const int CSSValueFirebrick = 413; -const int CSSValueFloralwhite = 414; -const int CSSValueForestgreen = 415; -const int CSSValueGainsboro = 416; -const int CSSValueGhostwhite = 417; -const int CSSValueGold = 418; -const int CSSValueGoldenrod = 419; -const int CSSValueGreenyellow = 420; -const int CSSValueHoneydew = 421; -const int CSSValueHotpink = 422; -const int CSSValueIndianred = 423; -const int CSSValueIndigo = 424; -const int CSSValueIvory = 425; -const int CSSValueKhaki = 426; -const int CSSValueLavender = 427; -const int CSSValueLavenderblush = 428; -const int CSSValueLawngreen = 429; -const int CSSValueLemonchiffon = 430; -const int CSSValueLightblue = 431; -const int CSSValueLightcoral = 432; -const int CSSValueLightcyan = 433; -const int CSSValueLightgoldenrodyellow = 434; -const int CSSValueLightgray = 435; -const int CSSValueLightgreen = 436; -const int CSSValueLightgrey = 437; -const int CSSValueLightpink = 438; -const int CSSValueLightsalmon = 439; -const int CSSValueLightseagreen = 440; -const int CSSValueLightskyblue = 441; -const int CSSValueLightslategray = 442; -const int CSSValueLightslategrey = 443; -const int CSSValueLightsteelblue = 444; -const int CSSValueLightyellow = 445; -const int CSSValueLimegreen = 446; -const int CSSValueLinen = 447; -const int CSSValueMagenta = 448; -const int CSSValueMediumaquamarine = 449; -const int CSSValueMediumblue = 450; -const int CSSValueMediumorchid = 451; -const int CSSValueMediumpurple = 452; -const int CSSValueMediumseagreen = 453; -const int CSSValueMediumslateblue = 454; -const int CSSValueMediumspringgreen = 455; -const int CSSValueMediumturquoise = 456; -const int CSSValueMediumvioletred = 457; -const int CSSValueMidnightblue = 458; -const int CSSValueMintcream = 459; -const int CSSValueMistyrose = 460; -const int CSSValueMoccasin = 461; -const int CSSValueNavajowhite = 462; -const int CSSValueOldlace = 463; -const int CSSValueOlivedrab = 464; -const int CSSValueOrangered = 465; -const int CSSValueOrchid = 466; -const int CSSValuePalegoldenrod = 467; -const int CSSValuePalegreen = 468; -const int CSSValuePaleturquoise = 469; -const int CSSValuePalevioletred = 470; -const int CSSValuePapayawhip = 471; -const int CSSValuePeachpuff = 472; -const int CSSValuePeru = 473; -const int CSSValuePink = 474; -const int CSSValuePlum = 475; -const int CSSValuePowderblue = 476; -const int CSSValueRosybrown = 477; -const int CSSValueRoyalblue = 478; -const int CSSValueSaddlebrown = 479; -const int CSSValueSalmon = 480; -const int CSSValueSandybrown = 481; -const int CSSValueSeagreen = 482; -const int CSSValueSeashell = 483; -const int CSSValueSienna = 484; -const int CSSValueSkyblue = 485; -const int CSSValueSlateblue = 486; -const int CSSValueSlategray = 487; -const int CSSValueSlategrey = 488; -const int CSSValueSnow = 489; -const int CSSValueSpringgreen = 490; -const int CSSValueSteelblue = 491; -const int CSSValueTan = 492; -const int CSSValueThistle = 493; -const int CSSValueTomato = 494; -const int CSSValueTurquoise = 495; -const int CSSValueViolet = 496; -const int CSSValueWheat = 497; -const int CSSValueWhitesmoke = 498; -const int CSSValueYellowgreen = 499; -const int CSSValueNonzero = 500; -const int CSSValueEvenodd = 501; -const int CSSValueAccumulate = 502; -const int CSSValueNew = 503; -const int CSSValueSrgb = 504; -const int CSSValueLinearrgb = 505; -const int CSSValueOptimizespeed = 506; -const int CSSValueOptimizequality = 507; -const int CSSValueCrispedges = 508; -const int CSSValueGeometricprecision = 509; -const int CSSValueButt = 510; -const int CSSValueMiter = 511; -const int CSSValueBevel = 512; -const int CSSValueOptimizelegibility = 513; -const int CSSValueBeforeEdge = 514; -const int CSSValueAfterEdge = 515; -const int CSSValueCentral = 516; -const int CSSValueTextBeforeEdge = 517; -const int CSSValueTextAfterEdge = 518; -const int CSSValueIdeographic = 519; -const int CSSValueAlphabetic = 520; -const int CSSValueHanging = 521; -const int CSSValueMathematical = 522; -const int CSSValueUseScript = 523; -const int CSSValueNoChange = 524; -const int CSSValueResetSize = 525; -const int CSSValueLrTb = 526; -const int CSSValueRlTb = 527; -const int CSSValueTbRl = 528; -const int CSSValueLr = 529; -const int CSSValueRl = 530; -const int CSSValueTb = 531; -const int numCSSValueKeywords = 532; +const int CSSValueMediaTimelineContainer = 330; +const int CSSValueMediaCurrentTimeDisplay = 331; +const int CSSValueMediaTimeRemainingDisplay = 332; +const int CSSValueMenulist = 333; +const int CSSValueMenulistButton = 334; +const int CSSValueMenulistText = 335; +const int CSSValueMenulistTextfield = 336; +const int CSSValueSliderHorizontal = 337; +const int CSSValueSliderVertical = 338; +const int CSSValueSliderthumbHorizontal = 339; +const int CSSValueSliderthumbVertical = 340; +const int CSSValueCaret = 341; +const int CSSValueSearchfield = 342; +const int CSSValueSearchfieldDecoration = 343; +const int CSSValueSearchfieldResultsDecoration = 344; +const int CSSValueSearchfieldResultsButton = 345; +const int CSSValueSearchfieldCancelButton = 346; +const int CSSValueTextfield = 347; +const int CSSValueTextarea = 348; +const int CSSValueCapsLockIndicator = 349; +const int CSSValueRound = 350; +const int CSSValueBorder = 351; +const int CSSValueContent = 352; +const int CSSValuePadding = 353; +const int CSSValuePaddingBox = 354; +const int CSSValueBorderBox = 355; +const int CSSValueContentBox = 356; +const int CSSValueLogical = 357; +const int CSSValueVisual = 358; +const int CSSValueLines = 359; +const int CSSValueRunning = 360; +const int CSSValuePaused = 361; +const int CSSValueFlat = 362; +const int CSSValuePreserve3d = 363; +const int CSSValueEase = 364; +const int CSSValueLinear = 365; +const int CSSValueEaseIn = 366; +const int CSSValueEaseOut = 367; +const int CSSValueEaseInOut = 368; +const int CSSValueDocument = 369; +const int CSSValueReset = 370; +const int CSSValueVisiblepainted = 371; +const int CSSValueVisiblefill = 372; +const int CSSValueVisiblestroke = 373; +const int CSSValuePainted = 374; +const int CSSValueFill = 375; +const int CSSValueStroke = 376; +const int CSSValueAliceblue = 377; +const int CSSValueAntiquewhite = 378; +const int CSSValueAquamarine = 379; +const int CSSValueAzure = 380; +const int CSSValueBeige = 381; +const int CSSValueBisque = 382; +const int CSSValueBlanchedalmond = 383; +const int CSSValueBlueviolet = 384; +const int CSSValueBrown = 385; +const int CSSValueBurlywood = 386; +const int CSSValueCadetblue = 387; +const int CSSValueChartreuse = 388; +const int CSSValueChocolate = 389; +const int CSSValueCoral = 390; +const int CSSValueCornflowerblue = 391; +const int CSSValueCornsilk = 392; +const int CSSValueCrimson = 393; +const int CSSValueCyan = 394; +const int CSSValueDarkblue = 395; +const int CSSValueDarkcyan = 396; +const int CSSValueDarkgoldenrod = 397; +const int CSSValueDarkgray = 398; +const int CSSValueDarkgreen = 399; +const int CSSValueDarkgrey = 400; +const int CSSValueDarkkhaki = 401; +const int CSSValueDarkmagenta = 402; +const int CSSValueDarkolivegreen = 403; +const int CSSValueDarkorange = 404; +const int CSSValueDarkorchid = 405; +const int CSSValueDarkred = 406; +const int CSSValueDarksalmon = 407; +const int CSSValueDarkseagreen = 408; +const int CSSValueDarkslateblue = 409; +const int CSSValueDarkslategray = 410; +const int CSSValueDarkslategrey = 411; +const int CSSValueDarkturquoise = 412; +const int CSSValueDarkviolet = 413; +const int CSSValueDeeppink = 414; +const int CSSValueDeepskyblue = 415; +const int CSSValueDimgray = 416; +const int CSSValueDimgrey = 417; +const int CSSValueDodgerblue = 418; +const int CSSValueFirebrick = 419; +const int CSSValueFloralwhite = 420; +const int CSSValueForestgreen = 421; +const int CSSValueGainsboro = 422; +const int CSSValueGhostwhite = 423; +const int CSSValueGold = 424; +const int CSSValueGoldenrod = 425; +const int CSSValueGreenyellow = 426; +const int CSSValueHoneydew = 427; +const int CSSValueHotpink = 428; +const int CSSValueIndianred = 429; +const int CSSValueIndigo = 430; +const int CSSValueIvory = 431; +const int CSSValueKhaki = 432; +const int CSSValueLavender = 433; +const int CSSValueLavenderblush = 434; +const int CSSValueLawngreen = 435; +const int CSSValueLemonchiffon = 436; +const int CSSValueLightblue = 437; +const int CSSValueLightcoral = 438; +const int CSSValueLightcyan = 439; +const int CSSValueLightgoldenrodyellow = 440; +const int CSSValueLightgray = 441; +const int CSSValueLightgreen = 442; +const int CSSValueLightgrey = 443; +const int CSSValueLightpink = 444; +const int CSSValueLightsalmon = 445; +const int CSSValueLightseagreen = 446; +const int CSSValueLightskyblue = 447; +const int CSSValueLightslategray = 448; +const int CSSValueLightslategrey = 449; +const int CSSValueLightsteelblue = 450; +const int CSSValueLightyellow = 451; +const int CSSValueLimegreen = 452; +const int CSSValueLinen = 453; +const int CSSValueMagenta = 454; +const int CSSValueMediumaquamarine = 455; +const int CSSValueMediumblue = 456; +const int CSSValueMediumorchid = 457; +const int CSSValueMediumpurple = 458; +const int CSSValueMediumseagreen = 459; +const int CSSValueMediumslateblue = 460; +const int CSSValueMediumspringgreen = 461; +const int CSSValueMediumturquoise = 462; +const int CSSValueMediumvioletred = 463; +const int CSSValueMidnightblue = 464; +const int CSSValueMintcream = 465; +const int CSSValueMistyrose = 466; +const int CSSValueMoccasin = 467; +const int CSSValueNavajowhite = 468; +const int CSSValueOldlace = 469; +const int CSSValueOlivedrab = 470; +const int CSSValueOrangered = 471; +const int CSSValueOrchid = 472; +const int CSSValuePalegoldenrod = 473; +const int CSSValuePalegreen = 474; +const int CSSValuePaleturquoise = 475; +const int CSSValuePalevioletred = 476; +const int CSSValuePapayawhip = 477; +const int CSSValuePeachpuff = 478; +const int CSSValuePeru = 479; +const int CSSValuePink = 480; +const int CSSValuePlum = 481; +const int CSSValuePowderblue = 482; +const int CSSValueRosybrown = 483; +const int CSSValueRoyalblue = 484; +const int CSSValueSaddlebrown = 485; +const int CSSValueSalmon = 486; +const int CSSValueSandybrown = 487; +const int CSSValueSeagreen = 488; +const int CSSValueSeashell = 489; +const int CSSValueSienna = 490; +const int CSSValueSkyblue = 491; +const int CSSValueSlateblue = 492; +const int CSSValueSlategray = 493; +const int CSSValueSlategrey = 494; +const int CSSValueSnow = 495; +const int CSSValueSpringgreen = 496; +const int CSSValueSteelblue = 497; +const int CSSValueTan = 498; +const int CSSValueThistle = 499; +const int CSSValueTomato = 500; +const int CSSValueTurquoise = 501; +const int CSSValueViolet = 502; +const int CSSValueWheat = 503; +const int CSSValueWhitesmoke = 504; +const int CSSValueYellowgreen = 505; +const int CSSValueNonzero = 506; +const int CSSValueEvenodd = 507; +const int CSSValueAccumulate = 508; +const int CSSValueNew = 509; +const int CSSValueSrgb = 510; +const int CSSValueLinearrgb = 511; +const int CSSValueOptimizespeed = 512; +const int CSSValueOptimizequality = 513; +const int CSSValueCrispedges = 514; +const int CSSValueGeometricprecision = 515; +const int CSSValueButt = 516; +const int CSSValueMiter = 517; +const int CSSValueBevel = 518; +const int CSSValueOptimizelegibility = 519; +const int CSSValueBeforeEdge = 520; +const int CSSValueAfterEdge = 521; +const int CSSValueCentral = 522; +const int CSSValueTextBeforeEdge = 523; +const int CSSValueTextAfterEdge = 524; +const int CSSValueIdeographic = 525; +const int CSSValueAlphabetic = 526; +const int CSSValueHanging = 527; +const int CSSValueMathematical = 528; +const int CSSValueUseScript = 529; +const int CSSValueNoChange = 530; +const int CSSValueResetSize = 531; +const int CSSValueLrTb = 532; +const int CSSValueRlTb = 533; +const int CSSValueTbRl = 534; +const int CSSValueLr = 535; +const int CSSValueRl = 536; +const int CSSValueTb = 537; +const int numCSSValueKeywords = 538; const size_t maxCSSValueKeywordLength = 30; const char* getValueName(unsigned short id); diff --git a/src/3rdparty/webkit/WebCore/generated/DatePrototype.lut.h b/src/3rdparty/webkit/WebCore/generated/DatePrototype.lut.h index 5138355974..80dc604277 100644 --- a/src/3rdparty/webkit/WebCore/generated/DatePrototype.lut.h +++ b/src/3rdparty/webkit/WebCore/generated/DatePrototype.lut.h @@ -12,7 +12,7 @@ static const struct HashTableValue dateTableValues[45] = { { "toLocaleString", DontEnum|Function, (intptr_t)dateProtoFuncToLocaleString, (intptr_t)0 }, { "toLocaleDateString", DontEnum|Function, (intptr_t)dateProtoFuncToLocaleDateString, (intptr_t)0 }, { "toLocaleTimeString", DontEnum|Function, (intptr_t)dateProtoFuncToLocaleTimeString, (intptr_t)0 }, - { "valueOf", DontEnum|Function, (intptr_t)dateProtoFuncValueOf, (intptr_t)0 }, + { "valueOf", DontEnum|Function, (intptr_t)dateProtoFuncGetTime, (intptr_t)0 }, { "getTime", DontEnum|Function, (intptr_t)dateProtoFuncGetTime, (intptr_t)0 }, { "getFullYear", DontEnum|Function, (intptr_t)dateProtoFuncGetFullYear, (intptr_t)0 }, { "getUTCFullYear", DontEnum|Function, (intptr_t)dateProtoFuncGetUTCFullYear, (intptr_t)0 }, @@ -53,10 +53,5 @@ static const struct HashTableValue dateTableValues[45] = { }; extern const struct HashTable dateTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 2047, dateTableValues, 0 }; -#else { 134, 127, dateTableValues, 0 }; -#endif - } // namespace diff --git a/src/3rdparty/webkit/WebCore/generated/Grammar.cpp b/src/3rdparty/webkit/WebCore/generated/Grammar.cpp index 6f09be8333..c186e47f86 100644 --- a/src/3rdparty/webkit/WebCore/generated/Grammar.cpp +++ b/src/3rdparty/webkit/WebCore/generated/Grammar.cpp @@ -1,24 +1,23 @@ -/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* A Bison parser, made by GNU Bison 2.4.1. */ - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +/* Skeleton implementation for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -29,7 +28,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -47,7 +46,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.3" +#define YYBISON_VERSION "2.4.1" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -55,159 +54,28 @@ /* Pure parsers. */ #define YYPURE 1 +/* Push parsers. */ +#define YYPUSH 0 + +/* Pull parsers. */ +#define YYPULL 1 + /* Using locations. */ #define YYLSP_NEEDED 1 /* Substitute the variable and function names. */ -#define yyparse jscyyparse -#define yylex jscyylex -#define yyerror jscyyerror -#define yylval jscyylval -#define yychar jscyychar -#define yydebug jscyydebug -#define yynerrs jscyynerrs -#define yylloc jscyylloc - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - NULLTOKEN = 258, - TRUETOKEN = 259, - FALSETOKEN = 260, - BREAK = 261, - CASE = 262, - DEFAULT = 263, - FOR = 264, - NEW = 265, - VAR = 266, - CONSTTOKEN = 267, - CONTINUE = 268, - FUNCTION = 269, - RETURN = 270, - VOIDTOKEN = 271, - DELETETOKEN = 272, - IF = 273, - THISTOKEN = 274, - DO = 275, - WHILE = 276, - INTOKEN = 277, - INSTANCEOF = 278, - TYPEOF = 279, - SWITCH = 280, - WITH = 281, - RESERVED = 282, - THROW = 283, - TRY = 284, - CATCH = 285, - FINALLY = 286, - DEBUGGER = 287, - IF_WITHOUT_ELSE = 288, - ELSE = 289, - EQEQ = 290, - NE = 291, - STREQ = 292, - STRNEQ = 293, - LE = 294, - GE = 295, - OR = 296, - AND = 297, - PLUSPLUS = 298, - MINUSMINUS = 299, - LSHIFT = 300, - RSHIFT = 301, - URSHIFT = 302, - PLUSEQUAL = 303, - MINUSEQUAL = 304, - MULTEQUAL = 305, - DIVEQUAL = 306, - LSHIFTEQUAL = 307, - RSHIFTEQUAL = 308, - URSHIFTEQUAL = 309, - ANDEQUAL = 310, - MODEQUAL = 311, - XOREQUAL = 312, - OREQUAL = 313, - OPENBRACE = 314, - CLOSEBRACE = 315, - NUMBER = 316, - IDENT = 317, - STRING = 318, - AUTOPLUSPLUS = 319, - AUTOMINUSMINUS = 320 - }; -#endif -/* Tokens. */ -#define NULLTOKEN 258 -#define TRUETOKEN 259 -#define FALSETOKEN 260 -#define BREAK 261 -#define CASE 262 -#define DEFAULT 263 -#define FOR 264 -#define NEW 265 -#define VAR 266 -#define CONSTTOKEN 267 -#define CONTINUE 268 -#define FUNCTION 269 -#define RETURN 270 -#define VOIDTOKEN 271 -#define DELETETOKEN 272 -#define IF 273 -#define THISTOKEN 274 -#define DO 275 -#define WHILE 276 -#define INTOKEN 277 -#define INSTANCEOF 278 -#define TYPEOF 279 -#define SWITCH 280 -#define WITH 281 -#define RESERVED 282 -#define THROW 283 -#define TRY 284 -#define CATCH 285 -#define FINALLY 286 -#define DEBUGGER 287 -#define IF_WITHOUT_ELSE 288 -#define ELSE 289 -#define EQEQ 290 -#define NE 291 -#define STREQ 292 -#define STRNEQ 293 -#define LE 294 -#define GE 295 -#define OR 296 -#define AND 297 -#define PLUSPLUS 298 -#define MINUSMINUS 299 -#define LSHIFT 300 -#define RSHIFT 301 -#define URSHIFT 302 -#define PLUSEQUAL 303 -#define MINUSEQUAL 304 -#define MULTEQUAL 305 -#define DIVEQUAL 306 -#define LSHIFTEQUAL 307 -#define RSHIFTEQUAL 308 -#define URSHIFTEQUAL 309 -#define ANDEQUAL 310 -#define MODEQUAL 311 -#define XOREQUAL 312 -#define OREQUAL 313 -#define OPENBRACE 314 -#define CLOSEBRACE 315 -#define NUMBER 316 -#define IDENT 317 -#define STRING 318 -#define AUTOPLUSPLUS 319 -#define AUTOMINUSMINUS 320 - - - +#define yyparse jscyyparse +#define yylex jscyylex +#define yyerror jscyyerror +#define yylval jscyylval +#define yychar jscyychar +#define yydebug jscyydebug +#define yynerrs jscyynerrs +#define yylloc jscyylloc /* Copy the first part of user declarations. */ + +/* Line 189 of yacc.c */ #line 3 "../../JavaScriptCore/parser/Grammar.y" @@ -238,7 +106,7 @@ #include <stdlib.h> #include "JSValue.h" #include "JSObject.h" -#include "Nodes.h" +#include "NodeConstructors.h" #include "Lexer.h" #include "JSString.h" #include "JSGlobalData.h" @@ -308,24 +176,24 @@ static ExpressionNode* combineVarInitializers(void*, ExpressionNode* list, Assig #define YYPARSE_PARAM globalPtr #define YYLEX_PARAM globalPtr -template <typename T> NodeDeclarationInfo<T> createNodeDeclarationInfo(T node, ParserRefCountedData<DeclarationStacks::VarStack>* varDecls, - ParserRefCountedData<DeclarationStacks::FunctionStack>* funcDecls, +template <typename T> NodeDeclarationInfo<T> createNodeDeclarationInfo(T node, ParserArenaData<DeclarationStacks::VarStack>* varDecls, + ParserArenaData<DeclarationStacks::FunctionStack>* funcDecls, CodeFeatures info, int numConstants) { ASSERT((info & ~AllFeatures) == 0); - NodeDeclarationInfo<T> result = {node, varDecls, funcDecls, info, numConstants}; + NodeDeclarationInfo<T> result = { node, varDecls, funcDecls, info, numConstants }; return result; } template <typename T> NodeInfo<T> createNodeInfo(T node, CodeFeatures info, int numConstants) { ASSERT((info & ~AllFeatures) == 0); - NodeInfo<T> result = {node, info, numConstants}; + NodeInfo<T> result = { node, info, numConstants }; return result; } -template <typename T> T mergeDeclarationLists(T decls1, T decls2) +template <typename T> inline T mergeDeclarationLists(T decls1, T decls2) { // decls1 or both are null if (!decls1) @@ -337,32 +205,35 @@ template <typename T> T mergeDeclarationLists(T decls1, T decls2) // Both are non-null decls1->data.append(decls2->data); - // We manually release the declaration lists to avoid accumulating many many - // unused heap allocated vectors - decls2->ref(); - decls2->deref(); + // Manually release as much as possible from the now-defunct declaration lists + // to avoid accumulating so many unused heap allocated vectors. + decls2->data.clear(); + return decls1; } -static void appendToVarDeclarationList(void* globalPtr, ParserRefCountedData<DeclarationStacks::VarStack>*& varDecls, const Identifier& ident, unsigned attrs) +static void appendToVarDeclarationList(void* globalPtr, ParserArenaData<DeclarationStacks::VarStack>*& varDecls, const Identifier& ident, unsigned attrs) { if (!varDecls) - varDecls = new ParserRefCountedData<DeclarationStacks::VarStack>(GLOBAL_DATA); + varDecls = new (GLOBAL_DATA) ParserArenaData<DeclarationStacks::VarStack>; varDecls->data.append(make_pair(ident, attrs)); } -static inline void appendToVarDeclarationList(void* globalPtr, ParserRefCountedData<DeclarationStacks::VarStack>*& varDecls, ConstDeclNode* decl) +static inline void appendToVarDeclarationList(void* globalPtr, ParserArenaData<DeclarationStacks::VarStack>*& varDecls, ConstDeclNode* decl) { unsigned attrs = DeclarationStacks::IsConstant; - if (decl->m_init) + if (decl->hasInitializer()) attrs |= DeclarationStacks::HasInitializer; - appendToVarDeclarationList(globalPtr, varDecls, decl->m_ident, attrs); + appendToVarDeclarationList(globalPtr, varDecls, decl->ident(), attrs); } +/* Line 189 of yacc.c */ +#line 236 "WebCore/tmp/../generated/Grammar.tab.c" + /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -381,10 +252,88 @@ static inline void appendToVarDeclarationList(void* globalPtr, ParserRefCountedD # define YYTOKEN_TABLE 0 #endif + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + NULLTOKEN = 258, + TRUETOKEN = 259, + FALSETOKEN = 260, + BREAK = 261, + CASE = 262, + DEFAULT = 263, + FOR = 264, + NEW = 265, + VAR = 266, + CONSTTOKEN = 267, + CONTINUE = 268, + FUNCTION = 269, + RETURN = 270, + VOIDTOKEN = 271, + DELETETOKEN = 272, + IF = 273, + THISTOKEN = 274, + DO = 275, + WHILE = 276, + INTOKEN = 277, + INSTANCEOF = 278, + TYPEOF = 279, + SWITCH = 280, + WITH = 281, + RESERVED = 282, + THROW = 283, + TRY = 284, + CATCH = 285, + FINALLY = 286, + DEBUGGER = 287, + IF_WITHOUT_ELSE = 288, + ELSE = 289, + EQEQ = 290, + NE = 291, + STREQ = 292, + STRNEQ = 293, + LE = 294, + GE = 295, + OR = 296, + AND = 297, + PLUSPLUS = 298, + MINUSMINUS = 299, + LSHIFT = 300, + RSHIFT = 301, + URSHIFT = 302, + PLUSEQUAL = 303, + MINUSEQUAL = 304, + MULTEQUAL = 305, + DIVEQUAL = 306, + LSHIFTEQUAL = 307, + RSHIFTEQUAL = 308, + URSHIFTEQUAL = 309, + ANDEQUAL = 310, + MODEQUAL = 311, + XOREQUAL = 312, + OREQUAL = 313, + OPENBRACE = 314, + CLOSEBRACE = 315, + NUMBER = 316, + IDENT = 317, + STRING = 318, + AUTOPLUSPLUS = 319, + AUTOMINUSMINUS = 320 + }; +#endif + + + #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 157 "../../JavaScriptCore/parser/Grammar.y" { + +/* Line 214 of yacc.c */ +#line 157 "../../JavaScriptCore/parser/Grammar.y" + int intValue; double doubleValue; Identifier* ident; @@ -414,13 +363,15 @@ typedef union YYSTYPE ParameterListInfo parameterList; Operator op; -} -/* Line 187 of yacc.c. */ -#line 420 "Grammar.tab.c" - YYSTYPE; + + + +/* Line 214 of yacc.c */ +#line 371 "WebCore/tmp/../generated/Grammar.tab.c" +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED @@ -440,8 +391,8 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 216 of yacc.c. */ -#line 445 "Grammar.tab.c" +/* Line 264 of yacc.c */ +#line 396 "WebCore/tmp/../generated/Grammar.tab.c" #ifdef short # undef short @@ -516,14 +467,14 @@ typedef short int yytype_int16; #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static int -YYID (int i) +YYID (int yyi) #else static int -YYID (i) - int i; +YYID (yyi) + int yyi; #endif { - return i; + return yyi; } #endif @@ -605,9 +556,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; - YYSTYPE yyvs; - YYLTYPE yyls; + yytype_int16 yyss_alloc; + YYSTYPE yyvs_alloc; + YYLTYPE yyls_alloc; }; /* The size of the maximum gap between one aligned stack and the next. */ @@ -642,12 +593,12 @@ union yyalloc elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack) \ +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ do \ { \ YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ @@ -1019,42 +970,42 @@ static const yytype_uint16 yyrline[] = 804, 805, 806, 807, 808, 809, 810, 811, 815, 817, 822, 824, 830, 837, 846, 854, 867, 874, 883, 891, 904, 906, 912, 920, 932, 933, 937, 941, 945, 949, - 951, 956, 959, 968, 970, 972, 974, 980, 987, 996, - 1002, 1013, 1014, 1018, 1019, 1023, 1027, 1031, 1035, 1042, - 1045, 1048, 1051, 1057, 1060, 1063, 1066, 1072, 1078, 1084, - 1085, 1094, 1095, 1099, 1105, 1115, 1116, 1120, 1121, 1125, - 1131, 1135, 1142, 1148, 1154, 1164, 1166, 1171, 1172, 1183, - 1184, 1191, 1192, 1202, 1205, 1211, 1212, 1216, 1217, 1222, - 1229, 1240, 1241, 1242, 1243, 1244, 1245, 1246, 1250, 1251, - 1252, 1253, 1254, 1258, 1259, 1263, 1264, 1265, 1267, 1271, - 1272, 1273, 1274, 1275, 1279, 1280, 1281, 1285, 1286, 1289, - 1291, 1295, 1296, 1300, 1301, 1302, 1303, 1304, 1308, 1309, - 1310, 1311, 1315, 1316, 1320, 1321, 1325, 1326, 1327, 1328, - 1332, 1333, 1334, 1335, 1339, 1340, 1344, 1345, 1349, 1350, - 1354, 1355, 1359, 1360, 1361, 1365, 1366, 1367, 1371, 1372, - 1373, 1374, 1375, 1376, 1377, 1378, 1379, 1380, 1381, 1384, - 1385, 1389, 1390, 1394, 1395, 1396, 1397, 1401, 1402, 1403, - 1404, 1408, 1409, 1410, 1414, 1415, 1416, 1420, 1421, 1422, - 1423, 1427, 1428, 1429, 1430, 1434, 1435, 1436, 1437, 1438, - 1439, 1440, 1444, 1445, 1446, 1447, 1448, 1449, 1453, 1454, - 1455, 1456, 1457, 1458, 1459, 1463, 1464, 1465, 1466, 1467, - 1471, 1472, 1473, 1474, 1475, 1479, 1480, 1481, 1482, 1483, - 1487, 1488, 1492, 1493, 1497, 1498, 1502, 1503, 1507, 1508, - 1512, 1513, 1517, 1518, 1522, 1523, 1527, 1528, 1532, 1533, - 1537, 1538, 1542, 1543, 1547, 1548, 1552, 1553, 1557, 1558, - 1562, 1563, 1567, 1568, 1572, 1573, 1577, 1578, 1582, 1583, - 1587, 1588, 1592, 1593, 1594, 1595, 1596, 1597, 1598, 1599, - 1600, 1601, 1602, 1603, 1607, 1608, 1612, 1613, 1617, 1618, - 1622, 1623, 1624, 1625, 1626, 1627, 1628, 1629, 1630, 1631, - 1632, 1633, 1634, 1635, 1636, 1637, 1638, 1642, 1643, 1647, - 1648, 1652, 1653, 1654, 1655, 1659, 1660, 1661, 1662, 1666, - 1667, 1671, 1672, 1676, 1677, 1681, 1685, 1689, 1693, 1694, - 1698, 1699, 1703, 1704, 1705, 1706, 1707, 1708, 1709, 1710, - 1713, 1715, 1718, 1720, 1724, 1725, 1726, 1727, 1731, 1732, - 1733, 1734, 1738, 1739, 1740, 1741, 1745, 1749, 1753, 1754, - 1757, 1759, 1763, 1764, 1768, 1769, 1773, 1774, 1778, 1782, - 1783, 1787, 1788, 1789, 1793, 1794, 1798, 1799, 1803, 1804, - 1805, 1806, 1810, 1811, 1814, 1816, 1820, 1821 + 951, 956, 959, 969, 971, 973, 975, 981, 988, 997, + 1003, 1014, 1015, 1019, 1020, 1024, 1028, 1032, 1036, 1043, + 1046, 1049, 1052, 1058, 1061, 1064, 1067, 1073, 1079, 1085, + 1086, 1095, 1096, 1100, 1106, 1116, 1117, 1121, 1122, 1126, + 1132, 1136, 1143, 1149, 1155, 1165, 1167, 1172, 1173, 1184, + 1185, 1192, 1193, 1203, 1206, 1212, 1213, 1217, 1218, 1223, + 1230, 1241, 1242, 1243, 1244, 1245, 1246, 1247, 1251, 1252, + 1253, 1254, 1255, 1259, 1260, 1264, 1265, 1266, 1268, 1272, + 1273, 1274, 1275, 1276, 1280, 1281, 1282, 1286, 1287, 1290, + 1292, 1296, 1297, 1301, 1302, 1303, 1304, 1305, 1309, 1310, + 1311, 1312, 1316, 1317, 1321, 1322, 1326, 1327, 1328, 1329, + 1333, 1334, 1335, 1336, 1340, 1341, 1345, 1346, 1350, 1351, + 1355, 1356, 1360, 1361, 1362, 1366, 1367, 1368, 1372, 1373, + 1374, 1375, 1376, 1377, 1378, 1379, 1380, 1381, 1382, 1385, + 1386, 1390, 1391, 1395, 1396, 1397, 1398, 1402, 1403, 1404, + 1405, 1409, 1410, 1411, 1415, 1416, 1417, 1421, 1422, 1423, + 1424, 1428, 1429, 1430, 1431, 1435, 1436, 1437, 1438, 1439, + 1440, 1441, 1445, 1446, 1447, 1448, 1449, 1450, 1454, 1455, + 1456, 1457, 1458, 1459, 1460, 1464, 1465, 1466, 1467, 1468, + 1472, 1473, 1474, 1475, 1476, 1480, 1481, 1482, 1483, 1484, + 1488, 1489, 1493, 1494, 1498, 1499, 1503, 1504, 1508, 1509, + 1513, 1514, 1518, 1519, 1523, 1524, 1528, 1529, 1533, 1534, + 1538, 1539, 1543, 1544, 1548, 1549, 1553, 1554, 1558, 1559, + 1563, 1564, 1568, 1569, 1573, 1574, 1578, 1579, 1583, 1584, + 1588, 1589, 1593, 1594, 1595, 1596, 1597, 1598, 1599, 1600, + 1601, 1602, 1603, 1604, 1608, 1609, 1613, 1614, 1618, 1619, + 1623, 1624, 1625, 1626, 1627, 1628, 1629, 1630, 1631, 1632, + 1633, 1634, 1635, 1636, 1637, 1638, 1639, 1643, 1644, 1648, + 1649, 1653, 1654, 1655, 1656, 1660, 1661, 1662, 1663, 1667, + 1668, 1672, 1673, 1677, 1678, 1682, 1686, 1690, 1694, 1695, + 1699, 1700, 1704, 1705, 1706, 1707, 1708, 1709, 1710, 1711, + 1714, 1716, 1719, 1721, 1725, 1726, 1727, 1728, 1732, 1733, + 1734, 1735, 1739, 1740, 1741, 1742, 1746, 1750, 1754, 1755, + 1758, 1760, 1764, 1765, 1769, 1770, 1774, 1775, 1779, 1783, + 1784, 1788, 1789, 1790, 1794, 1795, 1799, 1800, 1804, 1805, + 1806, 1807, 1811, 1812, 1815, 1817, 1821, 1822 }; #endif @@ -2361,17 +2312,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp) #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) +yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) #else static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; +yy_stack_print (yybottom, yytop) + yytype_int16 *yybottom; + yytype_int16 *yytop; #endif { YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } YYFPRINTF (stderr, "\n"); } @@ -2406,11 +2360,11 @@ yy_reduce_print (yyvsp, yylsp, yyrule) /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - fprintf (stderr, " $%d = ", yyi + 1); + YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], &(yyvsp[(yyi + 1) - (yynrhs)]) , &(yylsp[(yyi + 1) - (yynrhs)]) ); - fprintf (stderr, "\n"); + YYFPRINTF (stderr, "\n"); } } @@ -2692,10 +2646,8 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) break; } } - /* Prevent warnings from -Wmissing-prototypes. */ - #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus int yyparse (void *YYPARSE_PARAM); @@ -2714,10 +2666,9 @@ int yyparse (); - -/*----------. -| yyparse. | -`----------*/ +/*-------------------------. +| yyparse or yypush_parse. | +`-------------------------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -2741,88 +2692,97 @@ yyparse () #endif #endif { - /* The look-ahead symbol. */ +/* The lookahead symbol. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; -/* Number of syntax errors so far. */ -int yynerrs; -/* Location data for the look-ahead symbol. */ +/* Location data for the lookahead symbol. */ YYLTYPE yylloc; - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif + /* Number of syntax errors so far. */ + int yynerrs; - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. + int yystate; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ + /* The stacks and their tools: + `yyss': related to states. + `yyvs': related to semantic values. + `yyls': related to locations. - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss; + yytype_int16 *yyssp; - /* The location stack. */ - YYLTYPE yylsa[YYINITDEPTH]; - YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp; - /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[2]; + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs; + YYSTYPE *yyvsp; -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) + /* The location stack. */ + YYLTYPE yylsa[YYINITDEPTH]; + YYLTYPE *yyls; + YYLTYPE *yylsp; - YYSIZE_T yystacksize = YYINITDEPTH; + /* The locations where the error started and ended. */ + YYLTYPE yyerror_range[2]; + YYSIZE_T yystacksize; + + int yyn; + int yyresult; + /* Lookahead token as an internal (translated) token number. */ + int yytoken; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; YYLTYPE yyloc; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) + /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; + yytoken = 0; + yyss = yyssa; + yyvs = yyvsa; + yyls = yylsa; + yystacksize = YYINITDEPTH; + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ + yychar = YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack so that they stay on the same level as the state stack. The wasted elements are never initialized. */ - yyssp = yyss; yyvsp = yyvs; yylsp = yyls; + #if YYLTYPE_IS_TRIVIAL /* Initialize the default location before parsing starts. */ yylloc.first_line = yylloc.last_line = 1; - yylloc.first_column = yylloc.last_column = 0; + yylloc.first_column = yylloc.last_column = 1; #endif goto yysetstate; @@ -2861,6 +2821,7 @@ YYLTYPE yylloc; &yyvs1, yysize * sizeof (*yyvsp), &yyls1, yysize * sizeof (*yylsp), &yystacksize); + yyls = yyls1; yyss = yyss1; yyvs = yyvs1; @@ -2882,9 +2843,9 @@ YYLTYPE yylloc; (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - YYSTACK_RELOCATE (yyls); + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); + YYSTACK_RELOCATE (yyls_alloc, yyls); # undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); @@ -2905,6 +2866,9 @@ YYLTYPE yylloc; YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + if (yystate == YYFINAL) + YYACCEPT; + goto yybackup; /*-----------. @@ -2913,16 +2877,16 @@ YYLTYPE yylloc; yybackup: /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ + lookahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to look-ahead token. */ + /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -2954,20 +2918,16 @@ yybackup: goto yyreduce; } - if (yyn == YYFINAL) - YYACCEPT; - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; - /* Shift the look-ahead token. */ + /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; + /* Discard the shifted token. */ + yychar = YYEMPTY; yystate = yyn; *++yyvsp = yylval; @@ -3008,37 +2968,49 @@ yyreduce: switch (yyn) { case 2: + +/* Line 1455 of yacc.c */ #line 290 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new NullNode(GLOBAL_DATA), 0, 1); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) NullNode(GLOBAL_DATA), 0, 1); ;} break; case 3: + +/* Line 1455 of yacc.c */ #line 291 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new BooleanNode(GLOBAL_DATA, true), 0, 1); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) BooleanNode(GLOBAL_DATA, true), 0, 1); ;} break; case 4: + +/* Line 1455 of yacc.c */ #line 292 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new BooleanNode(GLOBAL_DATA, false), 0, 1); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) BooleanNode(GLOBAL_DATA, false), 0, 1); ;} break; case 5: + +/* Line 1455 of yacc.c */ #line 293 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeNumberNode(GLOBAL_DATA, (yyvsp[(1) - (1)].doubleValue)), 0, 1); ;} break; case 6: + +/* Line 1455 of yacc.c */ #line 294 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new StringNode(GLOBAL_DATA, *(yyvsp[(1) - (1)].ident)), 0, 1); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) StringNode(GLOBAL_DATA, *(yyvsp[(1) - (1)].ident)), 0, 1); ;} break; case 7: + +/* Line 1455 of yacc.c */ #line 295 "../../JavaScriptCore/parser/Grammar.y" { Lexer& l = *LEXER; if (!l.scanRegExp()) YYABORT; - RegExpNode* node = new RegExpNode(GLOBAL_DATA, l.pattern(), l.flags()); + RegExpNode* node = new (GLOBAL_DATA) RegExpNode(GLOBAL_DATA, l.pattern(), l.flags()); int size = l.pattern().size() + 2; // + 2 for the two /'s SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (1)]).first_column, (yylsp[(1) - (1)]).first_column + size, (yylsp[(1) - (1)]).first_column + size); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, 0, 0); @@ -3046,12 +3018,14 @@ yyreduce: break; case 8: + +/* Line 1455 of yacc.c */ #line 304 "../../JavaScriptCore/parser/Grammar.y" { Lexer& l = *LEXER; if (!l.scanRegExp()) YYABORT; - RegExpNode* node = new RegExpNode(GLOBAL_DATA, "=" + l.pattern(), l.flags()); + RegExpNode* node = new (GLOBAL_DATA) RegExpNode(GLOBAL_DATA, "=" + l.pattern(), l.flags()); int size = l.pattern().size() + 2; // + 2 for the two /'s SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (1)]).first_column, (yylsp[(1) - (1)]).first_column + size, (yylsp[(1) - (1)]).first_column + size); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, 0, 0); @@ -3059,26 +3033,36 @@ yyreduce: break; case 9: + +/* Line 1455 of yacc.c */ #line 316 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.propertyNode) = createNodeInfo<PropertyNode*>(new PropertyNode(GLOBAL_DATA, *(yyvsp[(1) - (3)].ident), (yyvsp[(3) - (3)].expressionNode).m_node, PropertyNode::Constant), (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.propertyNode) = createNodeInfo<PropertyNode*>(new (GLOBAL_DATA) PropertyNode(GLOBAL_DATA, *(yyvsp[(1) - (3)].ident), (yyvsp[(3) - (3)].expressionNode).m_node, PropertyNode::Constant), (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 10: + +/* Line 1455 of yacc.c */ #line 317 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.propertyNode) = createNodeInfo<PropertyNode*>(new PropertyNode(GLOBAL_DATA, *(yyvsp[(1) - (3)].ident), (yyvsp[(3) - (3)].expressionNode).m_node, PropertyNode::Constant), (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.propertyNode) = createNodeInfo<PropertyNode*>(new (GLOBAL_DATA) PropertyNode(GLOBAL_DATA, *(yyvsp[(1) - (3)].ident), (yyvsp[(3) - (3)].expressionNode).m_node, PropertyNode::Constant), (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 11: + +/* Line 1455 of yacc.c */ #line 318 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.propertyNode) = createNodeInfo<PropertyNode*>(new PropertyNode(GLOBAL_DATA, Identifier(GLOBAL_DATA, UString::from((yyvsp[(1) - (3)].doubleValue))), (yyvsp[(3) - (3)].expressionNode).m_node, PropertyNode::Constant), (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.propertyNode) = createNodeInfo<PropertyNode*>(new (GLOBAL_DATA) PropertyNode(GLOBAL_DATA, Identifier(GLOBAL_DATA, UString::from((yyvsp[(1) - (3)].doubleValue))), (yyvsp[(3) - (3)].expressionNode).m_node, PropertyNode::Constant), (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 12: + +/* Line 1455 of yacc.c */ #line 319 "../../JavaScriptCore/parser/Grammar.y" { (yyval.propertyNode) = createNodeInfo<PropertyNode*>(makeGetterOrSetterPropertyNode(globalPtr, *(yyvsp[(1) - (7)].ident), *(yyvsp[(2) - (7)].ident), 0, (yyvsp[(6) - (7)].functionBodyNode), LEXER->sourceCode((yyvsp[(5) - (7)].intValue), (yyvsp[(7) - (7)].intValue), (yylsp[(5) - (7)]).first_line)), ClosureFeature, 0); DBG((yyvsp[(6) - (7)].functionBodyNode), (yylsp[(5) - (7)]), (yylsp[(7) - (7)])); if (!(yyval.propertyNode).m_node) YYABORT; ;} break; case 13: + +/* Line 1455 of yacc.c */ #line 321 "../../JavaScriptCore/parser/Grammar.y" { (yyval.propertyNode) = createNodeInfo<PropertyNode*>(makeGetterOrSetterPropertyNode(globalPtr, *(yyvsp[(1) - (8)].ident), *(yyvsp[(2) - (8)].ident), (yyvsp[(4) - (8)].parameterList).m_node.head, (yyvsp[(7) - (8)].functionBodyNode), LEXER->sourceCode((yyvsp[(6) - (8)].intValue), (yyvsp[(8) - (8)].intValue), (yylsp[(6) - (8)]).first_line)), (yyvsp[(4) - (8)].parameterList).m_features | ClosureFeature, 0); @@ -3091,644 +3075,876 @@ yyreduce: break; case 14: + +/* Line 1455 of yacc.c */ #line 332 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.propertyList).m_node.head = new PropertyListNode(GLOBAL_DATA, (yyvsp[(1) - (1)].propertyNode).m_node); + { (yyval.propertyList).m_node.head = new (GLOBAL_DATA) PropertyListNode(GLOBAL_DATA, (yyvsp[(1) - (1)].propertyNode).m_node); (yyval.propertyList).m_node.tail = (yyval.propertyList).m_node.head; (yyval.propertyList).m_features = (yyvsp[(1) - (1)].propertyNode).m_features; (yyval.propertyList).m_numConstants = (yyvsp[(1) - (1)].propertyNode).m_numConstants; ;} break; case 15: + +/* Line 1455 of yacc.c */ #line 336 "../../JavaScriptCore/parser/Grammar.y" { (yyval.propertyList).m_node.head = (yyvsp[(1) - (3)].propertyList).m_node.head; - (yyval.propertyList).m_node.tail = new PropertyListNode(GLOBAL_DATA, (yyvsp[(3) - (3)].propertyNode).m_node, (yyvsp[(1) - (3)].propertyList).m_node.tail); + (yyval.propertyList).m_node.tail = new (GLOBAL_DATA) PropertyListNode(GLOBAL_DATA, (yyvsp[(3) - (3)].propertyNode).m_node, (yyvsp[(1) - (3)].propertyList).m_node.tail); (yyval.propertyList).m_features = (yyvsp[(1) - (3)].propertyList).m_features | (yyvsp[(3) - (3)].propertyNode).m_features; (yyval.propertyList).m_numConstants = (yyvsp[(1) - (3)].propertyList).m_numConstants + (yyvsp[(3) - (3)].propertyNode).m_numConstants; ;} break; case 17: + +/* Line 1455 of yacc.c */ #line 344 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new ObjectLiteralNode(GLOBAL_DATA), 0, 0); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) ObjectLiteralNode(GLOBAL_DATA), 0, 0); ;} break; case 18: + +/* Line 1455 of yacc.c */ #line 345 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new ObjectLiteralNode(GLOBAL_DATA, (yyvsp[(2) - (3)].propertyList).m_node.head), (yyvsp[(2) - (3)].propertyList).m_features, (yyvsp[(2) - (3)].propertyList).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) ObjectLiteralNode(GLOBAL_DATA, (yyvsp[(2) - (3)].propertyList).m_node.head), (yyvsp[(2) - (3)].propertyList).m_features, (yyvsp[(2) - (3)].propertyList).m_numConstants); ;} break; case 19: + +/* Line 1455 of yacc.c */ #line 347 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new ObjectLiteralNode(GLOBAL_DATA, (yyvsp[(2) - (4)].propertyList).m_node.head), (yyvsp[(2) - (4)].propertyList).m_features, (yyvsp[(2) - (4)].propertyList).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) ObjectLiteralNode(GLOBAL_DATA, (yyvsp[(2) - (4)].propertyList).m_node.head), (yyvsp[(2) - (4)].propertyList).m_features, (yyvsp[(2) - (4)].propertyList).m_numConstants); ;} break; case 20: + +/* Line 1455 of yacc.c */ #line 351 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new ThisNode(GLOBAL_DATA), ThisFeature, 0); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) ThisNode(GLOBAL_DATA), ThisFeature, 0); ;} break; case 23: + +/* Line 1455 of yacc.c */ #line 354 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new ResolveNode(GLOBAL_DATA, *(yyvsp[(1) - (1)].ident), (yylsp[(1) - (1)]).first_column), (*(yyvsp[(1) - (1)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0, 0); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) ResolveNode(GLOBAL_DATA, *(yyvsp[(1) - (1)].ident), (yylsp[(1) - (1)]).first_column), (*(yyvsp[(1) - (1)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0, 0); ;} break; case 24: + +/* Line 1455 of yacc.c */ #line 355 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = (yyvsp[(2) - (3)].expressionNode); ;} break; case 25: + +/* Line 1455 of yacc.c */ #line 359 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new ArrayNode(GLOBAL_DATA, (yyvsp[(2) - (3)].intValue)), 0, (yyvsp[(2) - (3)].intValue) ? 1 : 0); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) ArrayNode(GLOBAL_DATA, (yyvsp[(2) - (3)].intValue)), 0, (yyvsp[(2) - (3)].intValue) ? 1 : 0); ;} break; case 26: + +/* Line 1455 of yacc.c */ #line 360 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new ArrayNode(GLOBAL_DATA, (yyvsp[(2) - (3)].elementList).m_node.head), (yyvsp[(2) - (3)].elementList).m_features, (yyvsp[(2) - (3)].elementList).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) ArrayNode(GLOBAL_DATA, (yyvsp[(2) - (3)].elementList).m_node.head), (yyvsp[(2) - (3)].elementList).m_features, (yyvsp[(2) - (3)].elementList).m_numConstants); ;} break; case 27: + +/* Line 1455 of yacc.c */ #line 361 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new ArrayNode(GLOBAL_DATA, (yyvsp[(4) - (5)].intValue), (yyvsp[(2) - (5)].elementList).m_node.head), (yyvsp[(2) - (5)].elementList).m_features, (yyvsp[(4) - (5)].intValue) ? (yyvsp[(2) - (5)].elementList).m_numConstants + 1 : (yyvsp[(2) - (5)].elementList).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) ArrayNode(GLOBAL_DATA, (yyvsp[(4) - (5)].intValue), (yyvsp[(2) - (5)].elementList).m_node.head), (yyvsp[(2) - (5)].elementList).m_features, (yyvsp[(4) - (5)].intValue) ? (yyvsp[(2) - (5)].elementList).m_numConstants + 1 : (yyvsp[(2) - (5)].elementList).m_numConstants); ;} break; case 28: + +/* Line 1455 of yacc.c */ #line 365 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.elementList).m_node.head = new ElementNode(GLOBAL_DATA, (yyvsp[(1) - (2)].intValue), (yyvsp[(2) - (2)].expressionNode).m_node); + { (yyval.elementList).m_node.head = new (GLOBAL_DATA) ElementNode(GLOBAL_DATA, (yyvsp[(1) - (2)].intValue), (yyvsp[(2) - (2)].expressionNode).m_node); (yyval.elementList).m_node.tail = (yyval.elementList).m_node.head; (yyval.elementList).m_features = (yyvsp[(2) - (2)].expressionNode).m_features; (yyval.elementList).m_numConstants = (yyvsp[(2) - (2)].expressionNode).m_numConstants; ;} break; case 29: + +/* Line 1455 of yacc.c */ #line 370 "../../JavaScriptCore/parser/Grammar.y" { (yyval.elementList).m_node.head = (yyvsp[(1) - (4)].elementList).m_node.head; - (yyval.elementList).m_node.tail = new ElementNode(GLOBAL_DATA, (yyvsp[(1) - (4)].elementList).m_node.tail, (yyvsp[(3) - (4)].intValue), (yyvsp[(4) - (4)].expressionNode).m_node); + (yyval.elementList).m_node.tail = new (GLOBAL_DATA) ElementNode(GLOBAL_DATA, (yyvsp[(1) - (4)].elementList).m_node.tail, (yyvsp[(3) - (4)].intValue), (yyvsp[(4) - (4)].expressionNode).m_node); (yyval.elementList).m_features = (yyvsp[(1) - (4)].elementList).m_features | (yyvsp[(4) - (4)].expressionNode).m_features; (yyval.elementList).m_numConstants = (yyvsp[(1) - (4)].elementList).m_numConstants + (yyvsp[(4) - (4)].expressionNode).m_numConstants; ;} break; case 30: + +/* Line 1455 of yacc.c */ #line 377 "../../JavaScriptCore/parser/Grammar.y" { (yyval.intValue) = 0; ;} break; case 32: + +/* Line 1455 of yacc.c */ #line 382 "../../JavaScriptCore/parser/Grammar.y" { (yyval.intValue) = 1; ;} break; case 33: + +/* Line 1455 of yacc.c */ #line 383 "../../JavaScriptCore/parser/Grammar.y" { (yyval.intValue) = (yyvsp[(1) - (2)].intValue) + 1; ;} break; case 35: + +/* Line 1455 of yacc.c */ #line 388 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>((yyvsp[(1) - (1)].funcExprNode).m_node, (yyvsp[(1) - (1)].funcExprNode).m_features, (yyvsp[(1) - (1)].funcExprNode).m_numConstants); ;} break; case 36: + +/* Line 1455 of yacc.c */ #line 389 "../../JavaScriptCore/parser/Grammar.y" - { BracketAccessorNode* node = new BracketAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_features & AssignFeature); + { BracketAccessorNode* node = new (GLOBAL_DATA) BracketAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (4)]).first_column, (yylsp[(1) - (4)]).last_column, (yylsp[(4) - (4)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(1) - (4)].expressionNode).m_features | (yyvsp[(3) - (4)].expressionNode).m_features, (yyvsp[(1) - (4)].expressionNode).m_numConstants + (yyvsp[(3) - (4)].expressionNode).m_numConstants); ;} break; case 37: + +/* Line 1455 of yacc.c */ #line 393 "../../JavaScriptCore/parser/Grammar.y" - { DotAccessorNode* node = new DotAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, *(yyvsp[(3) - (3)].ident)); + { DotAccessorNode* node = new (GLOBAL_DATA) DotAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, *(yyvsp[(3) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(1) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(1) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants); ;} break; case 38: + +/* Line 1455 of yacc.c */ #line 397 "../../JavaScriptCore/parser/Grammar.y" - { NewExprNode* node = new NewExprNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].argumentsNode).m_node); + { NewExprNode* node = new (GLOBAL_DATA) NewExprNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].argumentsNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(2) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].argumentsNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].argumentsNode).m_numConstants); ;} break; case 40: + +/* Line 1455 of yacc.c */ #line 405 "../../JavaScriptCore/parser/Grammar.y" - { BracketAccessorNode* node = new BracketAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_features & AssignFeature); + { BracketAccessorNode* node = new (GLOBAL_DATA) BracketAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (4)]).first_column, (yylsp[(1) - (4)]).last_column, (yylsp[(4) - (4)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(1) - (4)].expressionNode).m_features | (yyvsp[(3) - (4)].expressionNode).m_features, (yyvsp[(1) - (4)].expressionNode).m_numConstants + (yyvsp[(3) - (4)].expressionNode).m_numConstants); ;} break; case 41: + +/* Line 1455 of yacc.c */ #line 409 "../../JavaScriptCore/parser/Grammar.y" - { DotAccessorNode* node = new DotAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, *(yyvsp[(3) - (3)].ident)); + { DotAccessorNode* node = new (GLOBAL_DATA) DotAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, *(yyvsp[(3) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(1) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(1) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants); ;} break; case 42: + +/* Line 1455 of yacc.c */ #line 413 "../../JavaScriptCore/parser/Grammar.y" - { NewExprNode* node = new NewExprNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].argumentsNode).m_node); + { NewExprNode* node = new (GLOBAL_DATA) NewExprNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].argumentsNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(2) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].argumentsNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].argumentsNode).m_numConstants); ;} break; case 44: + +/* Line 1455 of yacc.c */ #line 421 "../../JavaScriptCore/parser/Grammar.y" - { NewExprNode* node = new NewExprNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node); + { NewExprNode* node = new (GLOBAL_DATA) NewExprNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 46: + +/* Line 1455 of yacc.c */ #line 429 "../../JavaScriptCore/parser/Grammar.y" - { NewExprNode* node = new NewExprNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node); + { NewExprNode* node = new (GLOBAL_DATA) NewExprNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 47: + +/* Line 1455 of yacc.c */ #line 436 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = makeFunctionCallNode(globalPtr, (yyvsp[(1) - (2)].expressionNode), (yyvsp[(2) - (2)].argumentsNode), (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); ;} break; case 48: + +/* Line 1455 of yacc.c */ #line 437 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = makeFunctionCallNode(globalPtr, (yyvsp[(1) - (2)].expressionNode), (yyvsp[(2) - (2)].argumentsNode), (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); ;} break; case 49: + +/* Line 1455 of yacc.c */ #line 438 "../../JavaScriptCore/parser/Grammar.y" - { BracketAccessorNode* node = new BracketAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_features & AssignFeature); + { BracketAccessorNode* node = new (GLOBAL_DATA) BracketAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (4)]).first_column, (yylsp[(1) - (4)]).last_column, (yylsp[(4) - (4)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(1) - (4)].expressionNode).m_features | (yyvsp[(3) - (4)].expressionNode).m_features, (yyvsp[(1) - (4)].expressionNode).m_numConstants + (yyvsp[(3) - (4)].expressionNode).m_numConstants); ;} break; case 50: + +/* Line 1455 of yacc.c */ #line 442 "../../JavaScriptCore/parser/Grammar.y" - { DotAccessorNode* node = new DotAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, *(yyvsp[(3) - (3)].ident)); + { DotAccessorNode* node = new (GLOBAL_DATA) DotAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, *(yyvsp[(3) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(1) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(1) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants); ;} break; case 51: + +/* Line 1455 of yacc.c */ #line 448 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = makeFunctionCallNode(globalPtr, (yyvsp[(1) - (2)].expressionNode), (yyvsp[(2) - (2)].argumentsNode), (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); ;} break; case 52: + +/* Line 1455 of yacc.c */ #line 449 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = makeFunctionCallNode(globalPtr, (yyvsp[(1) - (2)].expressionNode), (yyvsp[(2) - (2)].argumentsNode), (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); ;} break; case 53: + +/* Line 1455 of yacc.c */ #line 450 "../../JavaScriptCore/parser/Grammar.y" - { BracketAccessorNode* node = new BracketAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_features & AssignFeature); + { BracketAccessorNode* node = new (GLOBAL_DATA) BracketAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (4)]).first_column, (yylsp[(1) - (4)]).last_column, (yylsp[(4) - (4)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(1) - (4)].expressionNode).m_features | (yyvsp[(3) - (4)].expressionNode).m_features, (yyvsp[(1) - (4)].expressionNode).m_numConstants + (yyvsp[(3) - (4)].expressionNode).m_numConstants); ;} break; case 54: + +/* Line 1455 of yacc.c */ #line 454 "../../JavaScriptCore/parser/Grammar.y" - { DotAccessorNode* node = new DotAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, *(yyvsp[(3) - (3)].ident)); + { DotAccessorNode* node = new (GLOBAL_DATA) DotAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, *(yyvsp[(3) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(1) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(1) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants); ;} break; case 55: + +/* Line 1455 of yacc.c */ #line 461 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.argumentsNode) = createNodeInfo<ArgumentsNode*>(new ArgumentsNode(GLOBAL_DATA), 0, 0); ;} + { (yyval.argumentsNode) = createNodeInfo<ArgumentsNode*>(new (GLOBAL_DATA) ArgumentsNode(GLOBAL_DATA), 0, 0); ;} break; case 56: + +/* Line 1455 of yacc.c */ #line 462 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.argumentsNode) = createNodeInfo<ArgumentsNode*>(new ArgumentsNode(GLOBAL_DATA, (yyvsp[(2) - (3)].argumentList).m_node.head), (yyvsp[(2) - (3)].argumentList).m_features, (yyvsp[(2) - (3)].argumentList).m_numConstants); ;} + { (yyval.argumentsNode) = createNodeInfo<ArgumentsNode*>(new (GLOBAL_DATA) ArgumentsNode(GLOBAL_DATA, (yyvsp[(2) - (3)].argumentList).m_node.head), (yyvsp[(2) - (3)].argumentList).m_features, (yyvsp[(2) - (3)].argumentList).m_numConstants); ;} break; case 57: + +/* Line 1455 of yacc.c */ #line 466 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.argumentList).m_node.head = new ArgumentListNode(GLOBAL_DATA, (yyvsp[(1) - (1)].expressionNode).m_node); + { (yyval.argumentList).m_node.head = new (GLOBAL_DATA) ArgumentListNode(GLOBAL_DATA, (yyvsp[(1) - (1)].expressionNode).m_node); (yyval.argumentList).m_node.tail = (yyval.argumentList).m_node.head; (yyval.argumentList).m_features = (yyvsp[(1) - (1)].expressionNode).m_features; (yyval.argumentList).m_numConstants = (yyvsp[(1) - (1)].expressionNode).m_numConstants; ;} break; case 58: + +/* Line 1455 of yacc.c */ #line 470 "../../JavaScriptCore/parser/Grammar.y" { (yyval.argumentList).m_node.head = (yyvsp[(1) - (3)].argumentList).m_node.head; - (yyval.argumentList).m_node.tail = new ArgumentListNode(GLOBAL_DATA, (yyvsp[(1) - (3)].argumentList).m_node.tail, (yyvsp[(3) - (3)].expressionNode).m_node); + (yyval.argumentList).m_node.tail = new (GLOBAL_DATA) ArgumentListNode(GLOBAL_DATA, (yyvsp[(1) - (3)].argumentList).m_node.tail, (yyvsp[(3) - (3)].expressionNode).m_node); (yyval.argumentList).m_features = (yyvsp[(1) - (3)].argumentList).m_features | (yyvsp[(3) - (3)].expressionNode).m_features; (yyval.argumentList).m_numConstants = (yyvsp[(1) - (3)].argumentList).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants; ;} break; case 64: + +/* Line 1455 of yacc.c */ #line 488 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makePostfixNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node, OpPlusPlus, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column), (yyvsp[(1) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (2)].expressionNode).m_numConstants); ;} break; case 65: + +/* Line 1455 of yacc.c */ #line 489 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makePostfixNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node, OpMinusMinus, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column), (yyvsp[(1) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (2)].expressionNode).m_numConstants); ;} break; case 67: + +/* Line 1455 of yacc.c */ #line 494 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makePostfixNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node, OpPlusPlus, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column), (yyvsp[(1) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (2)].expressionNode).m_numConstants); ;} break; case 68: + +/* Line 1455 of yacc.c */ #line 495 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makePostfixNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node, OpMinusMinus, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column), (yyvsp[(1) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (2)].expressionNode).m_numConstants); ;} break; case 69: + +/* Line 1455 of yacc.c */ #line 499 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeDeleteNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).last_column, (yylsp[(2) - (2)]).last_column), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 70: + +/* Line 1455 of yacc.c */ #line 500 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new VoidNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants + 1); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) VoidNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants + 1); ;} break; case 71: + +/* Line 1455 of yacc.c */ #line 501 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeTypeOfNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 72: + +/* Line 1455 of yacc.c */ #line 502 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makePrefixNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node, OpPlusPlus, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column), (yyvsp[(2) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 73: + +/* Line 1455 of yacc.c */ #line 503 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makePrefixNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node, OpPlusPlus, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column), (yyvsp[(2) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 74: + +/* Line 1455 of yacc.c */ #line 504 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makePrefixNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node, OpMinusMinus, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column), (yyvsp[(2) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 75: + +/* Line 1455 of yacc.c */ #line 505 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makePrefixNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node, OpMinusMinus, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column), (yyvsp[(2) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 76: + +/* Line 1455 of yacc.c */ #line 506 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new UnaryPlusNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) UnaryPlusNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 77: + +/* Line 1455 of yacc.c */ #line 507 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeNegateNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 78: + +/* Line 1455 of yacc.c */ #line 508 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeBitwiseNotNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 79: + +/* Line 1455 of yacc.c */ #line 509 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new LogicalNotNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) LogicalNotNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 85: + +/* Line 1455 of yacc.c */ #line 523 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeMultNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 86: + +/* Line 1455 of yacc.c */ #line 524 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeDivNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 87: + +/* Line 1455 of yacc.c */ #line 525 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new ModNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) ModNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 89: + +/* Line 1455 of yacc.c */ #line 531 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeMultNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 90: + +/* Line 1455 of yacc.c */ #line 533 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeDivNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 91: + +/* Line 1455 of yacc.c */ #line 535 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new ModNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) ModNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 93: + +/* Line 1455 of yacc.c */ #line 540 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeAddNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 94: + +/* Line 1455 of yacc.c */ #line 541 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeSubNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 96: + +/* Line 1455 of yacc.c */ #line 547 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeAddNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 97: + +/* Line 1455 of yacc.c */ #line 549 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeSubNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 99: + +/* Line 1455 of yacc.c */ #line 554 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeLeftShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 100: + +/* Line 1455 of yacc.c */ #line 555 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeRightShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 101: + +/* Line 1455 of yacc.c */ #line 556 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new UnsignedRightShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) UnsignedRightShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 103: + +/* Line 1455 of yacc.c */ #line 561 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeLeftShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 104: + +/* Line 1455 of yacc.c */ #line 562 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeRightShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 105: + +/* Line 1455 of yacc.c */ #line 563 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new UnsignedRightShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) UnsignedRightShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 107: + +/* Line 1455 of yacc.c */ #line 568 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new LessNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) LessNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 108: + +/* Line 1455 of yacc.c */ #line 569 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new GreaterNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) GreaterNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 109: + +/* Line 1455 of yacc.c */ #line 570 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new LessEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) LessEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 110: + +/* Line 1455 of yacc.c */ #line 571 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new GreaterEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) GreaterEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 111: + +/* Line 1455 of yacc.c */ #line 572 "../../JavaScriptCore/parser/Grammar.y" - { InstanceOfNode* node = new InstanceOfNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); + { InstanceOfNode* node = new (GLOBAL_DATA) InstanceOfNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(3) - (3)]).first_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 112: + +/* Line 1455 of yacc.c */ #line 575 "../../JavaScriptCore/parser/Grammar.y" - { InNode* node = new InNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); + { InNode* node = new (GLOBAL_DATA) InNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(3) - (3)]).first_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 114: + +/* Line 1455 of yacc.c */ #line 582 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new LessNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) LessNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 115: + +/* Line 1455 of yacc.c */ #line 583 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new GreaterNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) GreaterNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 116: + +/* Line 1455 of yacc.c */ #line 584 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new LessEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) LessEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 117: + +/* Line 1455 of yacc.c */ #line 585 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new GreaterEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) GreaterEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 118: + +/* Line 1455 of yacc.c */ #line 587 "../../JavaScriptCore/parser/Grammar.y" - { InstanceOfNode* node = new InstanceOfNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); + { InstanceOfNode* node = new (GLOBAL_DATA) InstanceOfNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(3) - (3)]).first_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 120: + +/* Line 1455 of yacc.c */ #line 594 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new LessNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) LessNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 121: + +/* Line 1455 of yacc.c */ #line 595 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new GreaterNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) GreaterNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 122: + +/* Line 1455 of yacc.c */ #line 596 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new LessEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) LessEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 123: + +/* Line 1455 of yacc.c */ #line 597 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new GreaterEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) GreaterEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 124: + +/* Line 1455 of yacc.c */ #line 599 "../../JavaScriptCore/parser/Grammar.y" - { InstanceOfNode* node = new InstanceOfNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); + { InstanceOfNode* node = new (GLOBAL_DATA) InstanceOfNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(3) - (3)]).first_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 125: + +/* Line 1455 of yacc.c */ #line 603 "../../JavaScriptCore/parser/Grammar.y" - { InNode* node = new InNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); + { InNode* node = new (GLOBAL_DATA) InNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(3) - (3)]).first_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(node, (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 127: + +/* Line 1455 of yacc.c */ #line 610 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new EqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) EqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 128: + +/* Line 1455 of yacc.c */ #line 611 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new NotEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) NotEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 129: + +/* Line 1455 of yacc.c */ #line 612 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new StrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) StrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 130: + +/* Line 1455 of yacc.c */ #line 613 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new NotStrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) NotStrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 132: + +/* Line 1455 of yacc.c */ #line 619 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new EqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) EqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 133: + +/* Line 1455 of yacc.c */ #line 621 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new NotEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) NotEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 134: + +/* Line 1455 of yacc.c */ #line 623 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new StrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) StrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 135: + +/* Line 1455 of yacc.c */ #line 625 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new NotStrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) NotStrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 137: + +/* Line 1455 of yacc.c */ #line 631 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new EqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) EqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 138: + +/* Line 1455 of yacc.c */ #line 632 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new NotEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) NotEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 139: + +/* Line 1455 of yacc.c */ #line 634 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new StrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) StrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 140: + +/* Line 1455 of yacc.c */ #line 636 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new NotStrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) NotStrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 142: + +/* Line 1455 of yacc.c */ #line 641 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new BitAndNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) BitAndNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 144: + +/* Line 1455 of yacc.c */ #line 647 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new BitAndNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) BitAndNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 146: + +/* Line 1455 of yacc.c */ #line 652 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new BitAndNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) BitAndNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 148: + +/* Line 1455 of yacc.c */ #line 657 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new BitXOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) BitXOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 150: + +/* Line 1455 of yacc.c */ #line 663 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new BitXOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) BitXOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 152: + +/* Line 1455 of yacc.c */ #line 669 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new BitXOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) BitXOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 154: + +/* Line 1455 of yacc.c */ #line 674 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new BitOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) BitOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 156: + +/* Line 1455 of yacc.c */ #line 680 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new BitOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) BitOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 158: + +/* Line 1455 of yacc.c */ #line 686 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new BitOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) BitOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 160: + +/* Line 1455 of yacc.c */ #line 691 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalAnd), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalAnd), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 162: + +/* Line 1455 of yacc.c */ #line 697 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalAnd), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalAnd), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 164: + +/* Line 1455 of yacc.c */ #line 703 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalAnd), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalAnd), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 166: + +/* Line 1455 of yacc.c */ #line 708 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalOr), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalOr), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 168: + +/* Line 1455 of yacc.c */ #line 714 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalOr), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalOr), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 170: + +/* Line 1455 of yacc.c */ #line 719 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalOr), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalOr), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 172: + +/* Line 1455 of yacc.c */ #line 725 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new ConditionalNode(GLOBAL_DATA, (yyvsp[(1) - (5)].expressionNode).m_node, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].expressionNode).m_node), (yyvsp[(1) - (5)].expressionNode).m_features | (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].expressionNode).m_features, (yyvsp[(1) - (5)].expressionNode).m_numConstants + (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) ConditionalNode(GLOBAL_DATA, (yyvsp[(1) - (5)].expressionNode).m_node, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].expressionNode).m_node), (yyvsp[(1) - (5)].expressionNode).m_features | (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].expressionNode).m_features, (yyvsp[(1) - (5)].expressionNode).m_numConstants + (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].expressionNode).m_numConstants); ;} break; case 174: + +/* Line 1455 of yacc.c */ #line 731 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new ConditionalNode(GLOBAL_DATA, (yyvsp[(1) - (5)].expressionNode).m_node, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].expressionNode).m_node), (yyvsp[(1) - (5)].expressionNode).m_features | (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].expressionNode).m_features, (yyvsp[(1) - (5)].expressionNode).m_numConstants + (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) ConditionalNode(GLOBAL_DATA, (yyvsp[(1) - (5)].expressionNode).m_node, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].expressionNode).m_node), (yyvsp[(1) - (5)].expressionNode).m_features | (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].expressionNode).m_features, (yyvsp[(1) - (5)].expressionNode).m_numConstants + (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].expressionNode).m_numConstants); ;} break; case 176: + +/* Line 1455 of yacc.c */ #line 737 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new ConditionalNode(GLOBAL_DATA, (yyvsp[(1) - (5)].expressionNode).m_node, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].expressionNode).m_node), (yyvsp[(1) - (5)].expressionNode).m_features | (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].expressionNode).m_features, (yyvsp[(1) - (5)].expressionNode).m_numConstants + (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) ConditionalNode(GLOBAL_DATA, (yyvsp[(1) - (5)].expressionNode).m_node, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].expressionNode).m_node), (yyvsp[(1) - (5)].expressionNode).m_features | (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].expressionNode).m_features, (yyvsp[(1) - (5)].expressionNode).m_numConstants + (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].expressionNode).m_numConstants); ;} break; case 178: + +/* Line 1455 of yacc.c */ #line 743 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeAssignNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(2) - (3)].op), (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(1) - (3)].expressionNode).m_features & AssignFeature, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).first_column + 1, (yylsp[(3) - (3)]).last_column), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); @@ -3736,6 +3952,8 @@ yyreduce: break; case 180: + +/* Line 1455 of yacc.c */ #line 751 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeAssignNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(2) - (3)].op), (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(1) - (3)].expressionNode).m_features & AssignFeature, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).first_column + 1, (yylsp[(3) - (3)]).last_column), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); @@ -3743,6 +3961,8 @@ yyreduce: break; case 182: + +/* Line 1455 of yacc.c */ #line 759 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(makeAssignNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(2) - (3)].op), (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(1) - (3)].expressionNode).m_features & AssignFeature, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).first_column + 1, (yylsp[(3) - (3)]).last_column), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); @@ -3750,99 +3970,137 @@ yyreduce: break; case 183: + +/* Line 1455 of yacc.c */ #line 765 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpEqual; ;} break; case 184: + +/* Line 1455 of yacc.c */ #line 766 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpPlusEq; ;} break; case 185: + +/* Line 1455 of yacc.c */ #line 767 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpMinusEq; ;} break; case 186: + +/* Line 1455 of yacc.c */ #line 768 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpMultEq; ;} break; case 187: + +/* Line 1455 of yacc.c */ #line 769 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpDivEq; ;} break; case 188: + +/* Line 1455 of yacc.c */ #line 770 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpLShift; ;} break; case 189: + +/* Line 1455 of yacc.c */ #line 771 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpRShift; ;} break; case 190: + +/* Line 1455 of yacc.c */ #line 772 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpURShift; ;} break; case 191: + +/* Line 1455 of yacc.c */ #line 773 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpAndEq; ;} break; case 192: + +/* Line 1455 of yacc.c */ #line 774 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpXOrEq; ;} break; case 193: + +/* Line 1455 of yacc.c */ #line 775 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpOrEq; ;} break; case 194: + +/* Line 1455 of yacc.c */ #line 776 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpModEq; ;} break; case 196: + +/* Line 1455 of yacc.c */ #line 781 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new CommaNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) CommaNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 198: + +/* Line 1455 of yacc.c */ #line 786 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new CommaNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) CommaNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 200: + +/* Line 1455 of yacc.c */ #line 791 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new CommaNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} + { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) CommaNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 218: + +/* Line 1455 of yacc.c */ #line 815 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new BlockNode(GLOBAL_DATA, 0), 0, 0, 0, 0); + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) BlockNode(GLOBAL_DATA, 0), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(2) - (2)])); ;} break; case 219: + +/* Line 1455 of yacc.c */ #line 817 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new BlockNode(GLOBAL_DATA, (yyvsp[(2) - (3)].sourceElements).m_node), (yyvsp[(2) - (3)].sourceElements).m_varDeclarations, (yyvsp[(2) - (3)].sourceElements).m_funcDeclarations, (yyvsp[(2) - (3)].sourceElements).m_features, (yyvsp[(2) - (3)].sourceElements).m_numConstants); + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) BlockNode(GLOBAL_DATA, (yyvsp[(2) - (3)].sourceElements).m_node), (yyvsp[(2) - (3)].sourceElements).m_varDeclarations, (yyvsp[(2) - (3)].sourceElements).m_funcDeclarations, (yyvsp[(2) - (3)].sourceElements).m_features, (yyvsp[(2) - (3)].sourceElements).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(3) - (3)])); ;} break; case 220: + +/* Line 1455 of yacc.c */ #line 822 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(makeVarStatementNode(GLOBAL_DATA, (yyvsp[(2) - (3)].varDeclList).m_node), (yyvsp[(2) - (3)].varDeclList).m_varDeclarations, (yyvsp[(2) - (3)].varDeclList).m_funcDeclarations, (yyvsp[(2) - (3)].varDeclList).m_features, (yyvsp[(2) - (3)].varDeclList).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(3) - (3)])); ;} break; case 221: + +/* Line 1455 of yacc.c */ #line 824 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(makeVarStatementNode(GLOBAL_DATA, (yyvsp[(2) - (3)].varDeclList).m_node), (yyvsp[(2) - (3)].varDeclList).m_varDeclarations, (yyvsp[(2) - (3)].varDeclList).m_funcDeclarations, (yyvsp[(2) - (3)].varDeclList).m_features, (yyvsp[(2) - (3)].varDeclList).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); @@ -3850,9 +4108,11 @@ yyreduce: break; case 222: + +/* Line 1455 of yacc.c */ #line 830 "../../JavaScriptCore/parser/Grammar.y" { (yyval.varDeclList).m_node = 0; - (yyval.varDeclList).m_varDeclarations = new ParserRefCountedData<DeclarationStacks::VarStack>(GLOBAL_DATA); + (yyval.varDeclList).m_varDeclarations = new (GLOBAL_DATA) ParserArenaData<DeclarationStacks::VarStack>; appendToVarDeclarationList(GLOBAL_DATA, (yyval.varDeclList).m_varDeclarations, *(yyvsp[(1) - (1)].ident), 0); (yyval.varDeclList).m_funcDeclarations = 0; (yyval.varDeclList).m_features = (*(yyvsp[(1) - (1)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0; @@ -3861,11 +4121,13 @@ yyreduce: break; case 223: + +/* Line 1455 of yacc.c */ #line 837 "../../JavaScriptCore/parser/Grammar.y" - { AssignResolveNode* node = new AssignResolveNode(GLOBAL_DATA, *(yyvsp[(1) - (2)].ident), (yyvsp[(2) - (2)].expressionNode).m_node, (yyvsp[(2) - (2)].expressionNode).m_features & AssignFeature); + { AssignResolveNode* node = new (GLOBAL_DATA) AssignResolveNode(GLOBAL_DATA, *(yyvsp[(1) - (2)].ident), (yyvsp[(2) - (2)].expressionNode).m_node, (yyvsp[(2) - (2)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column); (yyval.varDeclList).m_node = node; - (yyval.varDeclList).m_varDeclarations = new ParserRefCountedData<DeclarationStacks::VarStack>(GLOBAL_DATA); + (yyval.varDeclList).m_varDeclarations = new (GLOBAL_DATA) ParserArenaData<DeclarationStacks::VarStack>; appendToVarDeclarationList(GLOBAL_DATA, (yyval.varDeclList).m_varDeclarations, *(yyvsp[(1) - (2)].ident), DeclarationStacks::HasInitializer); (yyval.varDeclList).m_funcDeclarations = 0; (yyval.varDeclList).m_features = ((*(yyvsp[(1) - (2)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | (yyvsp[(2) - (2)].expressionNode).m_features; @@ -3874,6 +4136,8 @@ yyreduce: break; case 224: + +/* Line 1455 of yacc.c */ #line 847 "../../JavaScriptCore/parser/Grammar.y" { (yyval.varDeclList).m_node = (yyvsp[(1) - (3)].varDeclList).m_node; (yyval.varDeclList).m_varDeclarations = (yyvsp[(1) - (3)].varDeclList).m_varDeclarations; @@ -3885,8 +4149,10 @@ yyreduce: break; case 225: + +/* Line 1455 of yacc.c */ #line 855 "../../JavaScriptCore/parser/Grammar.y" - { AssignResolveNode* node = new AssignResolveNode(GLOBAL_DATA, *(yyvsp[(3) - (4)].ident), (yyvsp[(4) - (4)].expressionNode).m_node, (yyvsp[(4) - (4)].expressionNode).m_features & AssignFeature); + { AssignResolveNode* node = new (GLOBAL_DATA) AssignResolveNode(GLOBAL_DATA, *(yyvsp[(3) - (4)].ident), (yyvsp[(4) - (4)].expressionNode).m_node, (yyvsp[(4) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(3) - (4)]).first_column, (yylsp[(4) - (4)]).first_column + 1, (yylsp[(4) - (4)]).last_column); (yyval.varDeclList).m_node = combineVarInitializers(GLOBAL_DATA, (yyvsp[(1) - (4)].varDeclList).m_node, node); (yyval.varDeclList).m_varDeclarations = (yyvsp[(1) - (4)].varDeclList).m_varDeclarations; @@ -3898,9 +4164,11 @@ yyreduce: break; case 226: + +/* Line 1455 of yacc.c */ #line 867 "../../JavaScriptCore/parser/Grammar.y" { (yyval.varDeclList).m_node = 0; - (yyval.varDeclList).m_varDeclarations = new ParserRefCountedData<DeclarationStacks::VarStack>(GLOBAL_DATA); + (yyval.varDeclList).m_varDeclarations = new (GLOBAL_DATA) ParserArenaData<DeclarationStacks::VarStack>; appendToVarDeclarationList(GLOBAL_DATA, (yyval.varDeclList).m_varDeclarations, *(yyvsp[(1) - (1)].ident), 0); (yyval.varDeclList).m_funcDeclarations = 0; (yyval.varDeclList).m_features = (*(yyvsp[(1) - (1)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0; @@ -3909,11 +4177,13 @@ yyreduce: break; case 227: + +/* Line 1455 of yacc.c */ #line 874 "../../JavaScriptCore/parser/Grammar.y" - { AssignResolveNode* node = new AssignResolveNode(GLOBAL_DATA, *(yyvsp[(1) - (2)].ident), (yyvsp[(2) - (2)].expressionNode).m_node, (yyvsp[(2) - (2)].expressionNode).m_features & AssignFeature); + { AssignResolveNode* node = new (GLOBAL_DATA) AssignResolveNode(GLOBAL_DATA, *(yyvsp[(1) - (2)].ident), (yyvsp[(2) - (2)].expressionNode).m_node, (yyvsp[(2) - (2)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column); (yyval.varDeclList).m_node = node; - (yyval.varDeclList).m_varDeclarations = new ParserRefCountedData<DeclarationStacks::VarStack>(GLOBAL_DATA); + (yyval.varDeclList).m_varDeclarations = new (GLOBAL_DATA) ParserArenaData<DeclarationStacks::VarStack>; appendToVarDeclarationList(GLOBAL_DATA, (yyval.varDeclList).m_varDeclarations, *(yyvsp[(1) - (2)].ident), DeclarationStacks::HasInitializer); (yyval.varDeclList).m_funcDeclarations = 0; (yyval.varDeclList).m_features = ((*(yyvsp[(1) - (2)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | (yyvsp[(2) - (2)].expressionNode).m_features; @@ -3922,6 +4192,8 @@ yyreduce: break; case 228: + +/* Line 1455 of yacc.c */ #line 884 "../../JavaScriptCore/parser/Grammar.y" { (yyval.varDeclList).m_node = (yyvsp[(1) - (3)].varDeclList).m_node; (yyval.varDeclList).m_varDeclarations = (yyvsp[(1) - (3)].varDeclList).m_varDeclarations; @@ -3933,8 +4205,10 @@ yyreduce: break; case 229: + +/* Line 1455 of yacc.c */ #line 892 "../../JavaScriptCore/parser/Grammar.y" - { AssignResolveNode* node = new AssignResolveNode(GLOBAL_DATA, *(yyvsp[(3) - (4)].ident), (yyvsp[(4) - (4)].expressionNode).m_node, (yyvsp[(4) - (4)].expressionNode).m_features & AssignFeature); + { AssignResolveNode* node = new (GLOBAL_DATA) AssignResolveNode(GLOBAL_DATA, *(yyvsp[(3) - (4)].ident), (yyvsp[(4) - (4)].expressionNode).m_node, (yyvsp[(4) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(3) - (4)]).first_column, (yylsp[(4) - (4)]).first_column + 1, (yylsp[(4) - (4)]).last_column); (yyval.varDeclList).m_node = combineVarInitializers(GLOBAL_DATA, (yyvsp[(1) - (4)].varDeclList).m_node, node); (yyval.varDeclList).m_varDeclarations = (yyvsp[(1) - (4)].varDeclList).m_varDeclarations; @@ -3946,22 +4220,28 @@ yyreduce: break; case 230: + +/* Line 1455 of yacc.c */ #line 904 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new ConstStatementNode(GLOBAL_DATA, (yyvsp[(2) - (3)].constDeclList).m_node.head), (yyvsp[(2) - (3)].constDeclList).m_varDeclarations, (yyvsp[(2) - (3)].constDeclList).m_funcDeclarations, (yyvsp[(2) - (3)].constDeclList).m_features, (yyvsp[(2) - (3)].constDeclList).m_numConstants); + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) ConstStatementNode(GLOBAL_DATA, (yyvsp[(2) - (3)].constDeclList).m_node.head), (yyvsp[(2) - (3)].constDeclList).m_varDeclarations, (yyvsp[(2) - (3)].constDeclList).m_funcDeclarations, (yyvsp[(2) - (3)].constDeclList).m_features, (yyvsp[(2) - (3)].constDeclList).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(3) - (3)])); ;} break; case 231: + +/* Line 1455 of yacc.c */ #line 907 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new ConstStatementNode(GLOBAL_DATA, (yyvsp[(2) - (3)].constDeclList).m_node.head), (yyvsp[(2) - (3)].constDeclList).m_varDeclarations, (yyvsp[(2) - (3)].constDeclList).m_funcDeclarations, (yyvsp[(2) - (3)].constDeclList).m_features, (yyvsp[(2) - (3)].constDeclList).m_numConstants); + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) ConstStatementNode(GLOBAL_DATA, (yyvsp[(2) - (3)].constDeclList).m_node.head), (yyvsp[(2) - (3)].constDeclList).m_varDeclarations, (yyvsp[(2) - (3)].constDeclList).m_funcDeclarations, (yyvsp[(2) - (3)].constDeclList).m_features, (yyvsp[(2) - (3)].constDeclList).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); AUTO_SEMICOLON; ;} break; case 232: + +/* Line 1455 of yacc.c */ #line 912 "../../JavaScriptCore/parser/Grammar.y" { (yyval.constDeclList).m_node.head = (yyvsp[(1) - (1)].constDeclNode).m_node; (yyval.constDeclList).m_node.tail = (yyval.constDeclList).m_node.head; - (yyval.constDeclList).m_varDeclarations = new ParserRefCountedData<DeclarationStacks::VarStack>(GLOBAL_DATA); + (yyval.constDeclList).m_varDeclarations = new (GLOBAL_DATA) ParserArenaData<DeclarationStacks::VarStack>; appendToVarDeclarationList(GLOBAL_DATA, (yyval.constDeclList).m_varDeclarations, (yyvsp[(1) - (1)].constDeclNode).m_node); (yyval.constDeclList).m_funcDeclarations = 0; (yyval.constDeclList).m_features = (yyvsp[(1) - (1)].constDeclNode).m_features; @@ -3970,8 +4250,10 @@ yyreduce: break; case 233: + +/* Line 1455 of yacc.c */ #line 921 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.constDeclList).m_node.head = (yyvsp[(1) - (3)].constDeclList).m_node.head; + { (yyval.constDeclList).m_node.head = (yyvsp[(1) - (3)].constDeclList).m_node.head; (yyvsp[(1) - (3)].constDeclList).m_node.tail->m_next = (yyvsp[(3) - (3)].constDeclNode).m_node; (yyval.constDeclList).m_node.tail = (yyvsp[(3) - (3)].constDeclNode).m_node; (yyval.constDeclList).m_varDeclarations = (yyvsp[(1) - (3)].constDeclList).m_varDeclarations; @@ -3982,78 +4264,105 @@ yyreduce: break; case 234: + +/* Line 1455 of yacc.c */ #line 932 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.constDeclNode) = createNodeInfo<ConstDeclNode*>(new ConstDeclNode(GLOBAL_DATA, *(yyvsp[(1) - (1)].ident), 0), (*(yyvsp[(1) - (1)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0, 0); ;} + { (yyval.constDeclNode) = createNodeInfo<ConstDeclNode*>(new (GLOBAL_DATA) ConstDeclNode(GLOBAL_DATA, *(yyvsp[(1) - (1)].ident), 0), (*(yyvsp[(1) - (1)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0, 0); ;} break; case 235: + +/* Line 1455 of yacc.c */ #line 933 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.constDeclNode) = createNodeInfo<ConstDeclNode*>(new ConstDeclNode(GLOBAL_DATA, *(yyvsp[(1) - (2)].ident), (yyvsp[(2) - (2)].expressionNode).m_node), ((*(yyvsp[(1) - (2)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} + { (yyval.constDeclNode) = createNodeInfo<ConstDeclNode*>(new (GLOBAL_DATA) ConstDeclNode(GLOBAL_DATA, *(yyvsp[(1) - (2)].ident), (yyvsp[(2) - (2)].expressionNode).m_node), ((*(yyvsp[(1) - (2)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 236: + +/* Line 1455 of yacc.c */ #line 937 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = (yyvsp[(2) - (2)].expressionNode); ;} break; case 237: + +/* Line 1455 of yacc.c */ #line 941 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = (yyvsp[(2) - (2)].expressionNode); ;} break; case 238: + +/* Line 1455 of yacc.c */ #line 945 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new EmptyStatementNode(GLOBAL_DATA), 0, 0, 0, 0); ;} + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) EmptyStatementNode(GLOBAL_DATA), 0, 0, 0, 0); ;} break; case 239: + +/* Line 1455 of yacc.c */ #line 949 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new ExprStatementNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node), 0, 0, (yyvsp[(1) - (2)].expressionNode).m_features, (yyvsp[(1) - (2)].expressionNode).m_numConstants); + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) ExprStatementNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node), 0, 0, (yyvsp[(1) - (2)].expressionNode).m_features, (yyvsp[(1) - (2)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(2) - (2)])); ;} break; case 240: + +/* Line 1455 of yacc.c */ #line 951 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new ExprStatementNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node), 0, 0, (yyvsp[(1) - (2)].expressionNode).m_features, (yyvsp[(1) - (2)].expressionNode).m_numConstants); + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) ExprStatementNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node), 0, 0, (yyvsp[(1) - (2)].expressionNode).m_features, (yyvsp[(1) - (2)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(1) - (2)])); AUTO_SEMICOLON; ;} break; case 241: + +/* Line 1455 of yacc.c */ #line 957 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new IfNode(GLOBAL_DATA, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].statementNode).m_node), (yyvsp[(5) - (5)].statementNode).m_varDeclarations, (yyvsp[(5) - (5)].statementNode).m_funcDeclarations, (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].statementNode).m_features, (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].statementNode).m_numConstants); + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) IfNode(GLOBAL_DATA, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].statementNode).m_node), (yyvsp[(5) - (5)].statementNode).m_varDeclarations, (yyvsp[(5) - (5)].statementNode).m_funcDeclarations, (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].statementNode).m_features, (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].statementNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (5)]), (yylsp[(4) - (5)])); ;} break; case 242: + +/* Line 1455 of yacc.c */ #line 960 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new IfElseNode(GLOBAL_DATA, (yyvsp[(3) - (7)].expressionNode).m_node, (yyvsp[(5) - (7)].statementNode).m_node, (yyvsp[(7) - (7)].statementNode).m_node), - mergeDeclarationLists((yyvsp[(5) - (7)].statementNode).m_varDeclarations, (yyvsp[(7) - (7)].statementNode).m_varDeclarations), mergeDeclarationLists((yyvsp[(5) - (7)].statementNode).m_funcDeclarations, (yyvsp[(7) - (7)].statementNode).m_funcDeclarations), + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) IfElseNode(GLOBAL_DATA, (yyvsp[(3) - (7)].expressionNode).m_node, (yyvsp[(5) - (7)].statementNode).m_node, (yyvsp[(7) - (7)].statementNode).m_node), + mergeDeclarationLists((yyvsp[(5) - (7)].statementNode).m_varDeclarations, (yyvsp[(7) - (7)].statementNode).m_varDeclarations), + mergeDeclarationLists((yyvsp[(5) - (7)].statementNode).m_funcDeclarations, (yyvsp[(7) - (7)].statementNode).m_funcDeclarations), (yyvsp[(3) - (7)].expressionNode).m_features | (yyvsp[(5) - (7)].statementNode).m_features | (yyvsp[(7) - (7)].statementNode).m_features, (yyvsp[(3) - (7)].expressionNode).m_numConstants + (yyvsp[(5) - (7)].statementNode).m_numConstants + (yyvsp[(7) - (7)].statementNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (7)]), (yylsp[(4) - (7)])); ;} break; case 243: -#line 968 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new DoWhileNode(GLOBAL_DATA, (yyvsp[(2) - (7)].statementNode).m_node, (yyvsp[(5) - (7)].expressionNode).m_node), (yyvsp[(2) - (7)].statementNode).m_varDeclarations, (yyvsp[(2) - (7)].statementNode).m_funcDeclarations, (yyvsp[(2) - (7)].statementNode).m_features | (yyvsp[(5) - (7)].expressionNode).m_features, (yyvsp[(2) - (7)].statementNode).m_numConstants + (yyvsp[(5) - (7)].expressionNode).m_numConstants); + +/* Line 1455 of yacc.c */ +#line 969 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) DoWhileNode(GLOBAL_DATA, (yyvsp[(2) - (7)].statementNode).m_node, (yyvsp[(5) - (7)].expressionNode).m_node), (yyvsp[(2) - (7)].statementNode).m_varDeclarations, (yyvsp[(2) - (7)].statementNode).m_funcDeclarations, (yyvsp[(2) - (7)].statementNode).m_features | (yyvsp[(5) - (7)].expressionNode).m_features, (yyvsp[(2) - (7)].statementNode).m_numConstants + (yyvsp[(5) - (7)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (7)]), (yylsp[(3) - (7)])); ;} break; case 244: -#line 970 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new DoWhileNode(GLOBAL_DATA, (yyvsp[(2) - (7)].statementNode).m_node, (yyvsp[(5) - (7)].expressionNode).m_node), (yyvsp[(2) - (7)].statementNode).m_varDeclarations, (yyvsp[(2) - (7)].statementNode).m_funcDeclarations, (yyvsp[(2) - (7)].statementNode).m_features | (yyvsp[(5) - (7)].expressionNode).m_features, (yyvsp[(2) - (7)].statementNode).m_numConstants + (yyvsp[(5) - (7)].expressionNode).m_numConstants); + +/* Line 1455 of yacc.c */ +#line 971 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) DoWhileNode(GLOBAL_DATA, (yyvsp[(2) - (7)].statementNode).m_node, (yyvsp[(5) - (7)].expressionNode).m_node), (yyvsp[(2) - (7)].statementNode).m_varDeclarations, (yyvsp[(2) - (7)].statementNode).m_funcDeclarations, (yyvsp[(2) - (7)].statementNode).m_features | (yyvsp[(5) - (7)].expressionNode).m_features, (yyvsp[(2) - (7)].statementNode).m_numConstants + (yyvsp[(5) - (7)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (7)]), (yylsp[(3) - (7)])); ;} break; case 245: -#line 972 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new WhileNode(GLOBAL_DATA, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].statementNode).m_node), (yyvsp[(5) - (5)].statementNode).m_varDeclarations, (yyvsp[(5) - (5)].statementNode).m_funcDeclarations, (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].statementNode).m_features, (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].statementNode).m_numConstants); + +/* Line 1455 of yacc.c */ +#line 973 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) WhileNode(GLOBAL_DATA, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].statementNode).m_node), (yyvsp[(5) - (5)].statementNode).m_varDeclarations, (yyvsp[(5) - (5)].statementNode).m_funcDeclarations, (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].statementNode).m_features, (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].statementNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (5)]), (yylsp[(4) - (5)])); ;} break; case 246: -#line 975 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new ForNode(GLOBAL_DATA, (yyvsp[(3) - (9)].expressionNode).m_node, (yyvsp[(5) - (9)].expressionNode).m_node, (yyvsp[(7) - (9)].expressionNode).m_node, (yyvsp[(9) - (9)].statementNode).m_node, false), (yyvsp[(9) - (9)].statementNode).m_varDeclarations, (yyvsp[(9) - (9)].statementNode).m_funcDeclarations, + +/* Line 1455 of yacc.c */ +#line 976 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) ForNode(GLOBAL_DATA, (yyvsp[(3) - (9)].expressionNode).m_node, (yyvsp[(5) - (9)].expressionNode).m_node, (yyvsp[(7) - (9)].expressionNode).m_node, (yyvsp[(9) - (9)].statementNode).m_node, false), (yyvsp[(9) - (9)].statementNode).m_varDeclarations, (yyvsp[(9) - (9)].statementNode).m_funcDeclarations, (yyvsp[(3) - (9)].expressionNode).m_features | (yyvsp[(5) - (9)].expressionNode).m_features | (yyvsp[(7) - (9)].expressionNode).m_features | (yyvsp[(9) - (9)].statementNode).m_features, (yyvsp[(3) - (9)].expressionNode).m_numConstants + (yyvsp[(5) - (9)].expressionNode).m_numConstants + (yyvsp[(7) - (9)].expressionNode).m_numConstants + (yyvsp[(9) - (9)].statementNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (9)]), (yylsp[(8) - (9)])); @@ -4061,8 +4370,10 @@ yyreduce: break; case 247: -#line 981 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new ForNode(GLOBAL_DATA, (yyvsp[(4) - (10)].varDeclList).m_node, (yyvsp[(6) - (10)].expressionNode).m_node, (yyvsp[(8) - (10)].expressionNode).m_node, (yyvsp[(10) - (10)].statementNode).m_node, true), + +/* Line 1455 of yacc.c */ +#line 982 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) ForNode(GLOBAL_DATA, (yyvsp[(4) - (10)].varDeclList).m_node, (yyvsp[(6) - (10)].expressionNode).m_node, (yyvsp[(8) - (10)].expressionNode).m_node, (yyvsp[(10) - (10)].statementNode).m_node, true), mergeDeclarationLists((yyvsp[(4) - (10)].varDeclList).m_varDeclarations, (yyvsp[(10) - (10)].statementNode).m_varDeclarations), mergeDeclarationLists((yyvsp[(4) - (10)].varDeclList).m_funcDeclarations, (yyvsp[(10) - (10)].statementNode).m_funcDeclarations), (yyvsp[(4) - (10)].varDeclList).m_features | (yyvsp[(6) - (10)].expressionNode).m_features | (yyvsp[(8) - (10)].expressionNode).m_features | (yyvsp[(10) - (10)].statementNode).m_features, @@ -4071,9 +4382,11 @@ yyreduce: break; case 248: -#line 988 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 989 "../../JavaScriptCore/parser/Grammar.y" { - ForInNode* node = new ForInNode(GLOBAL_DATA, (yyvsp[(3) - (7)].expressionNode).m_node, (yyvsp[(5) - (7)].expressionNode).m_node, (yyvsp[(7) - (7)].statementNode).m_node); + ForInNode* node = new (GLOBAL_DATA) ForInNode(GLOBAL_DATA, (yyvsp[(3) - (7)].expressionNode).m_node, (yyvsp[(5) - (7)].expressionNode).m_node, (yyvsp[(7) - (7)].statementNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(3) - (7)]).first_column, (yylsp[(3) - (7)]).last_column, (yylsp[(5) - (7)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(node, (yyvsp[(7) - (7)].statementNode).m_varDeclarations, (yyvsp[(7) - (7)].statementNode).m_funcDeclarations, (yyvsp[(3) - (7)].expressionNode).m_features | (yyvsp[(5) - (7)].expressionNode).m_features | (yyvsp[(7) - (7)].statementNode).m_features, @@ -4083,8 +4396,10 @@ yyreduce: break; case 249: -#line 997 "../../JavaScriptCore/parser/Grammar.y" - { ForInNode *forIn = new ForInNode(GLOBAL_DATA, *(yyvsp[(4) - (8)].ident), 0, (yyvsp[(6) - (8)].expressionNode).m_node, (yyvsp[(8) - (8)].statementNode).m_node, (yylsp[(5) - (8)]).first_column, (yylsp[(5) - (8)]).first_column - (yylsp[(4) - (8)]).first_column, (yylsp[(6) - (8)]).last_column - (yylsp[(5) - (8)]).first_column); + +/* Line 1455 of yacc.c */ +#line 998 "../../JavaScriptCore/parser/Grammar.y" + { ForInNode *forIn = new (GLOBAL_DATA) ForInNode(GLOBAL_DATA, *(yyvsp[(4) - (8)].ident), 0, (yyvsp[(6) - (8)].expressionNode).m_node, (yyvsp[(8) - (8)].statementNode).m_node, (yylsp[(5) - (8)]).first_column, (yylsp[(5) - (8)]).first_column - (yylsp[(4) - (8)]).first_column, (yylsp[(6) - (8)]).last_column - (yylsp[(5) - (8)]).first_column); SET_EXCEPTION_LOCATION(forIn, (yylsp[(4) - (8)]).first_column, (yylsp[(5) - (8)]).first_column + 1, (yylsp[(6) - (8)]).last_column); appendToVarDeclarationList(GLOBAL_DATA, (yyvsp[(8) - (8)].statementNode).m_varDeclarations, *(yyvsp[(4) - (8)].ident), DeclarationStacks::HasInitializer); (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(forIn, (yyvsp[(8) - (8)].statementNode).m_varDeclarations, (yyvsp[(8) - (8)].statementNode).m_funcDeclarations, ((*(yyvsp[(4) - (8)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | (yyvsp[(6) - (8)].expressionNode).m_features | (yyvsp[(8) - (8)].statementNode).m_features, (yyvsp[(6) - (8)].expressionNode).m_numConstants + (yyvsp[(8) - (8)].statementNode).m_numConstants); @@ -4092,8 +4407,10 @@ yyreduce: break; case 250: -#line 1003 "../../JavaScriptCore/parser/Grammar.y" - { ForInNode *forIn = new ForInNode(GLOBAL_DATA, *(yyvsp[(4) - (9)].ident), (yyvsp[(5) - (9)].expressionNode).m_node, (yyvsp[(7) - (9)].expressionNode).m_node, (yyvsp[(9) - (9)].statementNode).m_node, (yylsp[(5) - (9)]).first_column, (yylsp[(5) - (9)]).first_column - (yylsp[(4) - (9)]).first_column, (yylsp[(5) - (9)]).last_column - (yylsp[(5) - (9)]).first_column); + +/* Line 1455 of yacc.c */ +#line 1004 "../../JavaScriptCore/parser/Grammar.y" + { ForInNode *forIn = new (GLOBAL_DATA) ForInNode(GLOBAL_DATA, *(yyvsp[(4) - (9)].ident), (yyvsp[(5) - (9)].expressionNode).m_node, (yyvsp[(7) - (9)].expressionNode).m_node, (yyvsp[(9) - (9)].statementNode).m_node, (yylsp[(5) - (9)]).first_column, (yylsp[(5) - (9)]).first_column - (yylsp[(4) - (9)]).first_column, (yylsp[(5) - (9)]).last_column - (yylsp[(5) - (9)]).first_column); SET_EXCEPTION_LOCATION(forIn, (yylsp[(4) - (9)]).first_column, (yylsp[(6) - (9)]).first_column + 1, (yylsp[(7) - (9)]).last_column); appendToVarDeclarationList(GLOBAL_DATA, (yyvsp[(9) - (9)].statementNode).m_varDeclarations, *(yyvsp[(4) - (9)].ident), DeclarationStacks::HasInitializer); (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(forIn, (yyvsp[(9) - (9)].statementNode).m_varDeclarations, (yyvsp[(9) - (9)].statementNode).m_funcDeclarations, @@ -4103,125 +4420,161 @@ yyreduce: break; case 251: -#line 1013 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1014 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(0, 0, 0); ;} break; case 253: -#line 1018 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1019 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo<ExpressionNode*>(0, 0, 0); ;} break; case 255: -#line 1023 "../../JavaScriptCore/parser/Grammar.y" - { ContinueNode* node = new ContinueNode(GLOBAL_DATA); + +/* Line 1455 of yacc.c */ +#line 1024 "../../JavaScriptCore/parser/Grammar.y" + { ContinueNode* node = new (GLOBAL_DATA) ContinueNode(GLOBAL_DATA); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(node, 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(2) - (2)])); ;} break; case 256: -#line 1027 "../../JavaScriptCore/parser/Grammar.y" - { ContinueNode* node = new ContinueNode(GLOBAL_DATA); + +/* Line 1455 of yacc.c */ +#line 1028 "../../JavaScriptCore/parser/Grammar.y" + { ContinueNode* node = new (GLOBAL_DATA) ContinueNode(GLOBAL_DATA); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(node, 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(1) - (2)])); AUTO_SEMICOLON; ;} break; case 257: -#line 1031 "../../JavaScriptCore/parser/Grammar.y" - { ContinueNode* node = new ContinueNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)); + +/* Line 1455 of yacc.c */ +#line 1032 "../../JavaScriptCore/parser/Grammar.y" + { ContinueNode* node = new (GLOBAL_DATA) ContinueNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(node, 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(3) - (3)])); ;} break; case 258: -#line 1035 "../../JavaScriptCore/parser/Grammar.y" - { ContinueNode* node = new ContinueNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)); + +/* Line 1455 of yacc.c */ +#line 1036 "../../JavaScriptCore/parser/Grammar.y" + { ContinueNode* node = new (GLOBAL_DATA) ContinueNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(node, 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); AUTO_SEMICOLON; ;} break; case 259: -#line 1042 "../../JavaScriptCore/parser/Grammar.y" - { BreakNode* node = new BreakNode(GLOBAL_DATA); + +/* Line 1455 of yacc.c */ +#line 1043 "../../JavaScriptCore/parser/Grammar.y" + { BreakNode* node = new (GLOBAL_DATA) BreakNode(GLOBAL_DATA); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(node, 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(2) - (2)])); ;} break; case 260: -#line 1045 "../../JavaScriptCore/parser/Grammar.y" - { BreakNode* node = new BreakNode(GLOBAL_DATA); + +/* Line 1455 of yacc.c */ +#line 1046 "../../JavaScriptCore/parser/Grammar.y" + { BreakNode* node = new (GLOBAL_DATA) BreakNode(GLOBAL_DATA); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); - (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new BreakNode(GLOBAL_DATA), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(1) - (2)])); AUTO_SEMICOLON; ;} + (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) BreakNode(GLOBAL_DATA), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(1) - (2)])); AUTO_SEMICOLON; ;} break; case 261: -#line 1048 "../../JavaScriptCore/parser/Grammar.y" - { BreakNode* node = new BreakNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)); + +/* Line 1455 of yacc.c */ +#line 1049 "../../JavaScriptCore/parser/Grammar.y" + { BreakNode* node = new (GLOBAL_DATA) BreakNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(node, 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(3) - (3)])); ;} break; case 262: -#line 1051 "../../JavaScriptCore/parser/Grammar.y" - { BreakNode* node = new BreakNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)); + +/* Line 1455 of yacc.c */ +#line 1052 "../../JavaScriptCore/parser/Grammar.y" + { BreakNode* node = new (GLOBAL_DATA) BreakNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); - (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new BreakNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); AUTO_SEMICOLON; ;} + (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) BreakNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); AUTO_SEMICOLON; ;} break; case 263: -#line 1057 "../../JavaScriptCore/parser/Grammar.y" - { ReturnNode* node = new ReturnNode(GLOBAL_DATA, 0); + +/* Line 1455 of yacc.c */ +#line 1058 "../../JavaScriptCore/parser/Grammar.y" + { ReturnNode* node = new (GLOBAL_DATA) ReturnNode(GLOBAL_DATA, 0); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(node, 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(2) - (2)])); ;} break; case 264: -#line 1060 "../../JavaScriptCore/parser/Grammar.y" - { ReturnNode* node = new ReturnNode(GLOBAL_DATA, 0); + +/* Line 1455 of yacc.c */ +#line 1061 "../../JavaScriptCore/parser/Grammar.y" + { ReturnNode* node = new (GLOBAL_DATA) ReturnNode(GLOBAL_DATA, 0); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(node, 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(1) - (2)])); AUTO_SEMICOLON; ;} break; case 265: -#line 1063 "../../JavaScriptCore/parser/Grammar.y" - { ReturnNode* node = new ReturnNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node); + +/* Line 1455 of yacc.c */ +#line 1064 "../../JavaScriptCore/parser/Grammar.y" + { ReturnNode* node = new (GLOBAL_DATA) ReturnNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(node, 0, 0, (yyvsp[(2) - (3)].expressionNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(3) - (3)])); ;} break; case 266: -#line 1066 "../../JavaScriptCore/parser/Grammar.y" - { ReturnNode* node = new ReturnNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node); + +/* Line 1455 of yacc.c */ +#line 1067 "../../JavaScriptCore/parser/Grammar.y" + { ReturnNode* node = new (GLOBAL_DATA) ReturnNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(node, 0, 0, (yyvsp[(2) - (3)].expressionNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); AUTO_SEMICOLON; ;} break; case 267: -#line 1072 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new WithNode(GLOBAL_DATA, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].statementNode).m_node, (yylsp[(3) - (5)]).last_column, (yylsp[(3) - (5)]).last_column - (yylsp[(3) - (5)]).first_column), + +/* Line 1455 of yacc.c */ +#line 1073 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) WithNode(GLOBAL_DATA, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].statementNode).m_node, (yylsp[(3) - (5)]).last_column, (yylsp[(3) - (5)]).last_column - (yylsp[(3) - (5)]).first_column), (yyvsp[(5) - (5)].statementNode).m_varDeclarations, (yyvsp[(5) - (5)].statementNode).m_funcDeclarations, (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].statementNode).m_features | WithFeature, (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].statementNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (5)]), (yylsp[(4) - (5)])); ;} break; case 268: -#line 1078 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new SwitchNode(GLOBAL_DATA, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].caseBlockNode).m_node), (yyvsp[(5) - (5)].caseBlockNode).m_varDeclarations, (yyvsp[(5) - (5)].caseBlockNode).m_funcDeclarations, + +/* Line 1455 of yacc.c */ +#line 1079 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) SwitchNode(GLOBAL_DATA, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].caseBlockNode).m_node), (yyvsp[(5) - (5)].caseBlockNode).m_varDeclarations, (yyvsp[(5) - (5)].caseBlockNode).m_funcDeclarations, (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].caseBlockNode).m_features, (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].caseBlockNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (5)]), (yylsp[(4) - (5)])); ;} break; case 269: -#line 1084 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.caseBlockNode) = createNodeDeclarationInfo<CaseBlockNode*>(new CaseBlockNode(GLOBAL_DATA, (yyvsp[(2) - (3)].clauseList).m_node.head, 0, 0), (yyvsp[(2) - (3)].clauseList).m_varDeclarations, (yyvsp[(2) - (3)].clauseList).m_funcDeclarations, (yyvsp[(2) - (3)].clauseList).m_features, (yyvsp[(2) - (3)].clauseList).m_numConstants); ;} + +/* Line 1455 of yacc.c */ +#line 1085 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.caseBlockNode) = createNodeDeclarationInfo<CaseBlockNode*>(new (GLOBAL_DATA) CaseBlockNode(GLOBAL_DATA, (yyvsp[(2) - (3)].clauseList).m_node.head, 0, 0), (yyvsp[(2) - (3)].clauseList).m_varDeclarations, (yyvsp[(2) - (3)].clauseList).m_funcDeclarations, (yyvsp[(2) - (3)].clauseList).m_features, (yyvsp[(2) - (3)].clauseList).m_numConstants); ;} break; case 270: -#line 1086 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.caseBlockNode) = createNodeDeclarationInfo<CaseBlockNode*>(new CaseBlockNode(GLOBAL_DATA, (yyvsp[(2) - (5)].clauseList).m_node.head, (yyvsp[(3) - (5)].caseClauseNode).m_node, (yyvsp[(4) - (5)].clauseList).m_node.head), + +/* Line 1455 of yacc.c */ +#line 1087 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.caseBlockNode) = createNodeDeclarationInfo<CaseBlockNode*>(new (GLOBAL_DATA) CaseBlockNode(GLOBAL_DATA, (yyvsp[(2) - (5)].clauseList).m_node.head, (yyvsp[(3) - (5)].caseClauseNode).m_node, (yyvsp[(4) - (5)].clauseList).m_node.head), mergeDeclarationLists(mergeDeclarationLists((yyvsp[(2) - (5)].clauseList).m_varDeclarations, (yyvsp[(3) - (5)].caseClauseNode).m_varDeclarations), (yyvsp[(4) - (5)].clauseList).m_varDeclarations), mergeDeclarationLists(mergeDeclarationLists((yyvsp[(2) - (5)].clauseList).m_funcDeclarations, (yyvsp[(3) - (5)].caseClauseNode).m_funcDeclarations), (yyvsp[(4) - (5)].clauseList).m_funcDeclarations), (yyvsp[(2) - (5)].clauseList).m_features | (yyvsp[(3) - (5)].caseClauseNode).m_features | (yyvsp[(4) - (5)].clauseList).m_features, @@ -4229,13 +4582,17 @@ yyreduce: break; case 271: -#line 1094 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1095 "../../JavaScriptCore/parser/Grammar.y" { (yyval.clauseList).m_node.head = 0; (yyval.clauseList).m_node.tail = 0; (yyval.clauseList).m_varDeclarations = 0; (yyval.clauseList).m_funcDeclarations = 0; (yyval.clauseList).m_features = 0; (yyval.clauseList).m_numConstants = 0; ;} break; case 273: -#line 1099 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.clauseList).m_node.head = new ClauseListNode(GLOBAL_DATA, (yyvsp[(1) - (1)].caseClauseNode).m_node); + +/* Line 1455 of yacc.c */ +#line 1100 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.clauseList).m_node.head = new (GLOBAL_DATA) ClauseListNode(GLOBAL_DATA, (yyvsp[(1) - (1)].caseClauseNode).m_node); (yyval.clauseList).m_node.tail = (yyval.clauseList).m_node.head; (yyval.clauseList).m_varDeclarations = (yyvsp[(1) - (1)].caseClauseNode).m_varDeclarations; (yyval.clauseList).m_funcDeclarations = (yyvsp[(1) - (1)].caseClauseNode).m_funcDeclarations; @@ -4244,9 +4601,11 @@ yyreduce: break; case 274: -#line 1105 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1106 "../../JavaScriptCore/parser/Grammar.y" { (yyval.clauseList).m_node.head = (yyvsp[(1) - (2)].clauseList).m_node.head; - (yyval.clauseList).m_node.tail = new ClauseListNode(GLOBAL_DATA, (yyvsp[(1) - (2)].clauseList).m_node.tail, (yyvsp[(2) - (2)].caseClauseNode).m_node); + (yyval.clauseList).m_node.tail = new (GLOBAL_DATA) ClauseListNode(GLOBAL_DATA, (yyvsp[(1) - (2)].clauseList).m_node.tail, (yyvsp[(2) - (2)].caseClauseNode).m_node); (yyval.clauseList).m_varDeclarations = mergeDeclarationLists((yyvsp[(1) - (2)].clauseList).m_varDeclarations, (yyvsp[(2) - (2)].caseClauseNode).m_varDeclarations); (yyval.clauseList).m_funcDeclarations = mergeDeclarationLists((yyvsp[(1) - (2)].clauseList).m_funcDeclarations, (yyvsp[(2) - (2)].caseClauseNode).m_funcDeclarations); (yyval.clauseList).m_features = (yyvsp[(1) - (2)].clauseList).m_features | (yyvsp[(2) - (2)].caseClauseNode).m_features; @@ -4255,51 +4614,67 @@ yyreduce: break; case 275: -#line 1115 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.caseClauseNode) = createNodeDeclarationInfo<CaseClauseNode*>(new CaseClauseNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node), 0, 0, (yyvsp[(2) - (3)].expressionNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants); ;} + +/* Line 1455 of yacc.c */ +#line 1116 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.caseClauseNode) = createNodeDeclarationInfo<CaseClauseNode*>(new (GLOBAL_DATA) CaseClauseNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node), 0, 0, (yyvsp[(2) - (3)].expressionNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants); ;} break; case 276: -#line 1116 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.caseClauseNode) = createNodeDeclarationInfo<CaseClauseNode*>(new CaseClauseNode(GLOBAL_DATA, (yyvsp[(2) - (4)].expressionNode).m_node, (yyvsp[(4) - (4)].sourceElements).m_node), (yyvsp[(4) - (4)].sourceElements).m_varDeclarations, (yyvsp[(4) - (4)].sourceElements).m_funcDeclarations, (yyvsp[(2) - (4)].expressionNode).m_features | (yyvsp[(4) - (4)].sourceElements).m_features, (yyvsp[(2) - (4)].expressionNode).m_numConstants + (yyvsp[(4) - (4)].sourceElements).m_numConstants); ;} + +/* Line 1455 of yacc.c */ +#line 1117 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.caseClauseNode) = createNodeDeclarationInfo<CaseClauseNode*>(new (GLOBAL_DATA) CaseClauseNode(GLOBAL_DATA, (yyvsp[(2) - (4)].expressionNode).m_node, (yyvsp[(4) - (4)].sourceElements).m_node), (yyvsp[(4) - (4)].sourceElements).m_varDeclarations, (yyvsp[(4) - (4)].sourceElements).m_funcDeclarations, (yyvsp[(2) - (4)].expressionNode).m_features | (yyvsp[(4) - (4)].sourceElements).m_features, (yyvsp[(2) - (4)].expressionNode).m_numConstants + (yyvsp[(4) - (4)].sourceElements).m_numConstants); ;} break; case 277: -#line 1120 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.caseClauseNode) = createNodeDeclarationInfo<CaseClauseNode*>(new CaseClauseNode(GLOBAL_DATA, 0), 0, 0, 0, 0); ;} + +/* Line 1455 of yacc.c */ +#line 1121 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.caseClauseNode) = createNodeDeclarationInfo<CaseClauseNode*>(new (GLOBAL_DATA) CaseClauseNode(GLOBAL_DATA, 0), 0, 0, 0, 0); ;} break; case 278: -#line 1121 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.caseClauseNode) = createNodeDeclarationInfo<CaseClauseNode*>(new CaseClauseNode(GLOBAL_DATA, 0, (yyvsp[(3) - (3)].sourceElements).m_node), (yyvsp[(3) - (3)].sourceElements).m_varDeclarations, (yyvsp[(3) - (3)].sourceElements).m_funcDeclarations, (yyvsp[(3) - (3)].sourceElements).m_features, (yyvsp[(3) - (3)].sourceElements).m_numConstants); ;} + +/* Line 1455 of yacc.c */ +#line 1122 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.caseClauseNode) = createNodeDeclarationInfo<CaseClauseNode*>(new (GLOBAL_DATA) CaseClauseNode(GLOBAL_DATA, 0, (yyvsp[(3) - (3)].sourceElements).m_node), (yyvsp[(3) - (3)].sourceElements).m_varDeclarations, (yyvsp[(3) - (3)].sourceElements).m_funcDeclarations, (yyvsp[(3) - (3)].sourceElements).m_features, (yyvsp[(3) - (3)].sourceElements).m_numConstants); ;} break; case 279: -#line 1125 "../../JavaScriptCore/parser/Grammar.y" - { LabelNode* node = new LabelNode(GLOBAL_DATA, *(yyvsp[(1) - (3)].ident), (yyvsp[(3) - (3)].statementNode).m_node); + +/* Line 1455 of yacc.c */ +#line 1126 "../../JavaScriptCore/parser/Grammar.y" + { LabelNode* node = new (GLOBAL_DATA) LabelNode(GLOBAL_DATA, *(yyvsp[(1) - (3)].ident), (yyvsp[(3) - (3)].statementNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(node, (yyvsp[(3) - (3)].statementNode).m_varDeclarations, (yyvsp[(3) - (3)].statementNode).m_funcDeclarations, (yyvsp[(3) - (3)].statementNode).m_features, (yyvsp[(3) - (3)].statementNode).m_numConstants); ;} break; case 280: -#line 1131 "../../JavaScriptCore/parser/Grammar.y" - { ThrowNode* node = new ThrowNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node); + +/* Line 1455 of yacc.c */ +#line 1132 "../../JavaScriptCore/parser/Grammar.y" + { ThrowNode* node = new (GLOBAL_DATA) ThrowNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(node, 0, 0, (yyvsp[(2) - (3)].expressionNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); ;} break; case 281: -#line 1135 "../../JavaScriptCore/parser/Grammar.y" - { ThrowNode* node = new ThrowNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node); + +/* Line 1455 of yacc.c */ +#line 1136 "../../JavaScriptCore/parser/Grammar.y" + { ThrowNode* node = new (GLOBAL_DATA) ThrowNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(node, 0, 0, (yyvsp[(2) - (3)].expressionNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); AUTO_SEMICOLON; ;} break; case 282: -#line 1142 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new TryNode(GLOBAL_DATA, (yyvsp[(2) - (4)].statementNode).m_node, GLOBAL_DATA->propertyNames->nullIdentifier, false, 0, (yyvsp[(4) - (4)].statementNode).m_node), + +/* Line 1455 of yacc.c */ +#line 1143 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) TryNode(GLOBAL_DATA, (yyvsp[(2) - (4)].statementNode).m_node, GLOBAL_DATA->propertyNames->nullIdentifier, false, 0, (yyvsp[(4) - (4)].statementNode).m_node), mergeDeclarationLists((yyvsp[(2) - (4)].statementNode).m_varDeclarations, (yyvsp[(4) - (4)].statementNode).m_varDeclarations), mergeDeclarationLists((yyvsp[(2) - (4)].statementNode).m_funcDeclarations, (yyvsp[(4) - (4)].statementNode).m_funcDeclarations), (yyvsp[(2) - (4)].statementNode).m_features | (yyvsp[(4) - (4)].statementNode).m_features, @@ -4308,8 +4683,10 @@ yyreduce: break; case 283: -#line 1148 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new TryNode(GLOBAL_DATA, (yyvsp[(2) - (7)].statementNode).m_node, *(yyvsp[(5) - (7)].ident), ((yyvsp[(7) - (7)].statementNode).m_features & EvalFeature) != 0, (yyvsp[(7) - (7)].statementNode).m_node, 0), + +/* Line 1455 of yacc.c */ +#line 1149 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) TryNode(GLOBAL_DATA, (yyvsp[(2) - (7)].statementNode).m_node, *(yyvsp[(5) - (7)].ident), ((yyvsp[(7) - (7)].statementNode).m_features & EvalFeature) != 0, (yyvsp[(7) - (7)].statementNode).m_node, 0), mergeDeclarationLists((yyvsp[(2) - (7)].statementNode).m_varDeclarations, (yyvsp[(7) - (7)].statementNode).m_varDeclarations), mergeDeclarationLists((yyvsp[(2) - (7)].statementNode).m_funcDeclarations, (yyvsp[(7) - (7)].statementNode).m_funcDeclarations), (yyvsp[(2) - (7)].statementNode).m_features | (yyvsp[(7) - (7)].statementNode).m_features | CatchFeature, @@ -4318,8 +4695,10 @@ yyreduce: break; case 284: -#line 1155 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new TryNode(GLOBAL_DATA, (yyvsp[(2) - (9)].statementNode).m_node, *(yyvsp[(5) - (9)].ident), ((yyvsp[(7) - (9)].statementNode).m_features & EvalFeature) != 0, (yyvsp[(7) - (9)].statementNode).m_node, (yyvsp[(9) - (9)].statementNode).m_node), + +/* Line 1455 of yacc.c */ +#line 1156 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) TryNode(GLOBAL_DATA, (yyvsp[(2) - (9)].statementNode).m_node, *(yyvsp[(5) - (9)].ident), ((yyvsp[(7) - (9)].statementNode).m_features & EvalFeature) != 0, (yyvsp[(7) - (9)].statementNode).m_node, (yyvsp[(9) - (9)].statementNode).m_node), mergeDeclarationLists(mergeDeclarationLists((yyvsp[(2) - (9)].statementNode).m_varDeclarations, (yyvsp[(7) - (9)].statementNode).m_varDeclarations), (yyvsp[(9) - (9)].statementNode).m_varDeclarations), mergeDeclarationLists(mergeDeclarationLists((yyvsp[(2) - (9)].statementNode).m_funcDeclarations, (yyvsp[(7) - (9)].statementNode).m_funcDeclarations), (yyvsp[(9) - (9)].statementNode).m_funcDeclarations), (yyvsp[(2) - (9)].statementNode).m_features | (yyvsp[(7) - (9)].statementNode).m_features | (yyvsp[(9) - (9)].statementNode).m_features | CatchFeature, @@ -4328,26 +4707,34 @@ yyreduce: break; case 285: -#line 1164 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new DebuggerStatementNode(GLOBAL_DATA), 0, 0, 0, 0); + +/* Line 1455 of yacc.c */ +#line 1165 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) DebuggerStatementNode(GLOBAL_DATA), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(2) - (2)])); ;} break; case 286: -#line 1166 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new DebuggerStatementNode(GLOBAL_DATA), 0, 0, 0, 0); + +/* Line 1455 of yacc.c */ +#line 1167 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new (GLOBAL_DATA) DebuggerStatementNode(GLOBAL_DATA), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(1) - (2)])); AUTO_SEMICOLON; ;} break; case 287: -#line 1171 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new FuncDeclNode(GLOBAL_DATA, *(yyvsp[(2) - (7)].ident), (yyvsp[(6) - (7)].functionBodyNode), LEXER->sourceCode((yyvsp[(5) - (7)].intValue), (yyvsp[(7) - (7)].intValue), (yylsp[(5) - (7)]).first_line)), 0, new ParserRefCountedData<DeclarationStacks::FunctionStack>(GLOBAL_DATA), ((*(yyvsp[(2) - (7)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | ClosureFeature, 0); DBG((yyvsp[(6) - (7)].functionBodyNode), (yylsp[(5) - (7)]), (yylsp[(7) - (7)])); (yyval.statementNode).m_funcDeclarations->data.append(static_cast<FuncDeclNode*>((yyval.statementNode).m_node)); ;} + +/* Line 1455 of yacc.c */ +#line 1172 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new FuncDeclNode(GLOBAL_DATA, *(yyvsp[(2) - (7)].ident), (yyvsp[(6) - (7)].functionBodyNode), LEXER->sourceCode((yyvsp[(5) - (7)].intValue), (yyvsp[(7) - (7)].intValue), (yylsp[(5) - (7)]).first_line)), 0, new (GLOBAL_DATA) ParserArenaData<DeclarationStacks::FunctionStack>, ((*(yyvsp[(2) - (7)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | ClosureFeature, 0); DBG((yyvsp[(6) - (7)].functionBodyNode), (yylsp[(5) - (7)]), (yylsp[(7) - (7)])); (yyval.statementNode).m_funcDeclarations->data.append(static_cast<FuncDeclNode*>((yyval.statementNode).m_node)); ;} break; case 288: -#line 1173 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1174 "../../JavaScriptCore/parser/Grammar.y" { - (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new FuncDeclNode(GLOBAL_DATA, *(yyvsp[(2) - (8)].ident), (yyvsp[(7) - (8)].functionBodyNode), LEXER->sourceCode((yyvsp[(6) - (8)].intValue), (yyvsp[(8) - (8)].intValue), (yylsp[(6) - (8)]).first_line), (yyvsp[(4) - (8)].parameterList).m_node.head), 0, new ParserRefCountedData<DeclarationStacks::FunctionStack>(GLOBAL_DATA), ((*(yyvsp[(2) - (8)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | (yyvsp[(4) - (8)].parameterList).m_features | ClosureFeature, 0); + (yyval.statementNode) = createNodeDeclarationInfo<StatementNode*>(new FuncDeclNode(GLOBAL_DATA, *(yyvsp[(2) - (8)].ident), (yyvsp[(7) - (8)].functionBodyNode), LEXER->sourceCode((yyvsp[(6) - (8)].intValue), (yyvsp[(8) - (8)].intValue), (yylsp[(6) - (8)]).first_line), (yyvsp[(4) - (8)].parameterList).m_node.head), 0, new (GLOBAL_DATA) ParserArenaData<DeclarationStacks::FunctionStack>, ((*(yyvsp[(2) - (8)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | (yyvsp[(4) - (8)].parameterList).m_features | ClosureFeature, 0); if ((yyvsp[(4) - (8)].parameterList).m_features & ArgumentsFeature) (yyvsp[(7) - (8)].functionBodyNode)->setUsesArguments(); DBG((yyvsp[(7) - (8)].functionBodyNode), (yylsp[(6) - (8)]), (yylsp[(8) - (8)])); @@ -4356,12 +4743,16 @@ yyreduce: break; case 289: -#line 1183 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1184 "../../JavaScriptCore/parser/Grammar.y" { (yyval.funcExprNode) = createNodeInfo(new FuncExprNode(GLOBAL_DATA, GLOBAL_DATA->propertyNames->nullIdentifier, (yyvsp[(5) - (6)].functionBodyNode), LEXER->sourceCode((yyvsp[(4) - (6)].intValue), (yyvsp[(6) - (6)].intValue), (yylsp[(4) - (6)]).first_line)), ClosureFeature, 0); DBG((yyvsp[(5) - (6)].functionBodyNode), (yylsp[(4) - (6)]), (yylsp[(6) - (6)])); ;} break; case 290: -#line 1185 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1186 "../../JavaScriptCore/parser/Grammar.y" { (yyval.funcExprNode) = createNodeInfo(new FuncExprNode(GLOBAL_DATA, GLOBAL_DATA->propertyNames->nullIdentifier, (yyvsp[(6) - (7)].functionBodyNode), LEXER->sourceCode((yyvsp[(5) - (7)].intValue), (yyvsp[(7) - (7)].intValue), (yylsp[(5) - (7)]).first_line), (yyvsp[(3) - (7)].parameterList).m_node.head), (yyvsp[(3) - (7)].parameterList).m_features | ClosureFeature, 0); if ((yyvsp[(3) - (7)].parameterList).m_features & ArgumentsFeature) @@ -4371,12 +4762,16 @@ yyreduce: break; case 291: -#line 1191 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1192 "../../JavaScriptCore/parser/Grammar.y" { (yyval.funcExprNode) = createNodeInfo(new FuncExprNode(GLOBAL_DATA, *(yyvsp[(2) - (7)].ident), (yyvsp[(6) - (7)].functionBodyNode), LEXER->sourceCode((yyvsp[(5) - (7)].intValue), (yyvsp[(7) - (7)].intValue), (yylsp[(5) - (7)]).first_line)), ClosureFeature, 0); DBG((yyvsp[(6) - (7)].functionBodyNode), (yylsp[(5) - (7)]), (yylsp[(7) - (7)])); ;} break; case 292: -#line 1193 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1194 "../../JavaScriptCore/parser/Grammar.y" { (yyval.funcExprNode) = createNodeInfo(new FuncExprNode(GLOBAL_DATA, *(yyvsp[(2) - (8)].ident), (yyvsp[(7) - (8)].functionBodyNode), LEXER->sourceCode((yyvsp[(6) - (8)].intValue), (yyvsp[(8) - (8)].intValue), (yylsp[(6) - (8)]).first_line), (yyvsp[(4) - (8)].parameterList).m_node.head), (yyvsp[(4) - (8)].parameterList).m_features | ClosureFeature, 0); if ((yyvsp[(4) - (8)].parameterList).m_features & ArgumentsFeature) @@ -4386,43 +4781,57 @@ yyreduce: break; case 293: -#line 1202 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.parameterList).m_node.head = new ParameterNode(GLOBAL_DATA, *(yyvsp[(1) - (1)].ident)); + +/* Line 1455 of yacc.c */ +#line 1203 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.parameterList).m_node.head = new (GLOBAL_DATA) ParameterNode(GLOBAL_DATA, *(yyvsp[(1) - (1)].ident)); (yyval.parameterList).m_features = (*(yyvsp[(1) - (1)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0; (yyval.parameterList).m_node.tail = (yyval.parameterList).m_node.head; ;} break; case 294: -#line 1205 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1206 "../../JavaScriptCore/parser/Grammar.y" { (yyval.parameterList).m_node.head = (yyvsp[(1) - (3)].parameterList).m_node.head; (yyval.parameterList).m_features = (yyvsp[(1) - (3)].parameterList).m_features | ((*(yyvsp[(3) - (3)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0); - (yyval.parameterList).m_node.tail = new ParameterNode(GLOBAL_DATA, (yyvsp[(1) - (3)].parameterList).m_node.tail, *(yyvsp[(3) - (3)].ident)); ;} + (yyval.parameterList).m_node.tail = new (GLOBAL_DATA) ParameterNode(GLOBAL_DATA, (yyvsp[(1) - (3)].parameterList).m_node.tail, *(yyvsp[(3) - (3)].ident)); ;} break; case 295: -#line 1211 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1212 "../../JavaScriptCore/parser/Grammar.y" { (yyval.functionBodyNode) = FunctionBodyNode::create(GLOBAL_DATA); ;} break; case 296: -#line 1212 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1213 "../../JavaScriptCore/parser/Grammar.y" { (yyval.functionBodyNode) = FunctionBodyNode::create(GLOBAL_DATA); ;} break; case 297: -#line 1216 "../../JavaScriptCore/parser/Grammar.y" - { GLOBAL_DATA->parser->didFinishParsing(new SourceElements(GLOBAL_DATA), 0, 0, NoFeatures, (yylsp[(0) - (0)]).last_line, 0); ;} + +/* Line 1455 of yacc.c */ +#line 1217 "../../JavaScriptCore/parser/Grammar.y" + { GLOBAL_DATA->parser->didFinishParsing(new (GLOBAL_DATA) SourceElements(GLOBAL_DATA), 0, 0, NoFeatures, (yylsp[(0) - (0)]).last_line, 0); ;} break; case 298: -#line 1217 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1218 "../../JavaScriptCore/parser/Grammar.y" { GLOBAL_DATA->parser->didFinishParsing((yyvsp[(1) - (1)].sourceElements).m_node, (yyvsp[(1) - (1)].sourceElements).m_varDeclarations, (yyvsp[(1) - (1)].sourceElements).m_funcDeclarations, (yyvsp[(1) - (1)].sourceElements).m_features, (yylsp[(1) - (1)]).last_line, (yyvsp[(1) - (1)].sourceElements).m_numConstants); ;} break; case 299: -#line 1222 "../../JavaScriptCore/parser/Grammar.y" - { (yyval.sourceElements).m_node = new SourceElements(GLOBAL_DATA); + +/* Line 1455 of yacc.c */ +#line 1223 "../../JavaScriptCore/parser/Grammar.y" + { (yyval.sourceElements).m_node = new (GLOBAL_DATA) SourceElements(GLOBAL_DATA); (yyval.sourceElements).m_node->append((yyvsp[(1) - (1)].statementNode).m_node); (yyval.sourceElements).m_varDeclarations = (yyvsp[(1) - (1)].statementNode).m_varDeclarations; (yyval.sourceElements).m_funcDeclarations = (yyvsp[(1) - (1)].statementNode).m_funcDeclarations; @@ -4432,7 +4841,9 @@ yyreduce: break; case 300: -#line 1229 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1230 "../../JavaScriptCore/parser/Grammar.y" { (yyval.sourceElements).m_node->append((yyvsp[(2) - (2)].statementNode).m_node); (yyval.sourceElements).m_varDeclarations = mergeDeclarationLists((yyvsp[(1) - (2)].sourceElements).m_varDeclarations, (yyvsp[(2) - (2)].statementNode).m_varDeclarations); (yyval.sourceElements).m_funcDeclarations = mergeDeclarationLists((yyvsp[(1) - (2)].sourceElements).m_funcDeclarations, (yyvsp[(2) - (2)].statementNode).m_funcDeclarations); @@ -4442,188 +4853,261 @@ yyreduce: break; case 304: -#line 1243 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1244 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 305: -#line 1244 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1245 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 306: -#line 1245 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1246 "../../JavaScriptCore/parser/Grammar.y" { Lexer& l = *LEXER; if (!l.scanRegExp()) YYABORT; ;} break; case 307: -#line 1246 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1247 "../../JavaScriptCore/parser/Grammar.y" { Lexer& l = *LEXER; if (!l.scanRegExp()) YYABORT; ;} break; case 308: -#line 1250 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1251 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 309: -#line 1251 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1252 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 310: -#line 1252 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1253 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 311: -#line 1253 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1254 "../../JavaScriptCore/parser/Grammar.y" { if (*(yyvsp[(1) - (7)].ident) != "get" && *(yyvsp[(1) - (7)].ident) != "set") YYABORT; ;} break; case 312: -#line 1254 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1255 "../../JavaScriptCore/parser/Grammar.y" { if (*(yyvsp[(1) - (8)].ident) != "get" && *(yyvsp[(1) - (8)].ident) != "set") YYABORT; ;} break; case 316: -#line 1264 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1265 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 317: -#line 1265 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1266 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 318: -#line 1267 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1268 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 322: -#line 1274 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1275 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 517: -#line 1642 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1643 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 518: -#line 1643 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1644 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 520: -#line 1648 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1649 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 521: -#line 1652 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1653 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 522: -#line 1653 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1654 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 525: -#line 1659 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1660 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 526: -#line 1660 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1661 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 530: -#line 1667 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1668 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 533: -#line 1676 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1677 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 534: -#line 1677 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1678 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 539: -#line 1694 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1695 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 555: -#line 1725 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1726 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 557: -#line 1727 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1728 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 559: -#line 1732 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1733 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 561: -#line 1734 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1735 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 563: -#line 1739 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1740 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 565: -#line 1741 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1742 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 568: -#line 1753 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1754 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 569: -#line 1754 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1755 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 578: -#line 1778 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1779 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 580: -#line 1783 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1784 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 585: -#line 1794 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1795 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 592: -#line 1810 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1455 of yacc.c */ +#line 1811 "../../JavaScriptCore/parser/Grammar.y" { ;} break; -/* Line 1267 of yacc.c. */ -#line 4627 "Grammar.tab.c" + +/* Line 1455 of yacc.c */ +#line 5111 "WebCore/tmp/../generated/Grammar.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -4699,7 +5183,7 @@ yyerrlab: if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an + /* If just tried and failed to reuse lookahead token after an error, discard it. */ if (yychar <= YYEOF) @@ -4716,7 +5200,7 @@ yyerrlab: } } - /* Else will try to reuse look-ahead token after shifting the error + /* Else will try to reuse lookahead token after shifting the error token. */ goto yyerrlab1; @@ -4774,14 +5258,11 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - *++yyvsp = yylval; yyerror_range[1] = yylloc; /* Using YYLLOC is tempting, but would change the location of - the look-ahead. YYLOC is available though. */ + the lookahead. YYLOC is available though. */ YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2); *++yylsp = yyloc; @@ -4806,7 +5287,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#ifndef yyoverflow +#if !defined(yyoverflow) || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -4817,7 +5298,7 @@ yyexhaustedlab: #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) + if (yychar != YYEMPTY) yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval, &yylloc); /* Do not reclaim the symbols of the rule which action triggered @@ -4843,29 +5324,31 @@ yyreturn: } -#line 1826 "../../JavaScriptCore/parser/Grammar.y" + +/* Line 1675 of yacc.c */ +#line 1827 "../../JavaScriptCore/parser/Grammar.y" static ExpressionNode* makeAssignNode(void* globalPtr, ExpressionNode* loc, Operator op, ExpressionNode* expr, bool locHasAssignments, bool exprHasAssignments, int start, int divot, int end) { if (!loc->isLocation()) - return new AssignErrorNode(GLOBAL_DATA, loc, op, expr, divot, divot - start, end - divot); + return new (GLOBAL_DATA) AssignErrorNode(GLOBAL_DATA, loc, op, expr, divot, divot - start, end - divot); if (loc->isResolveNode()) { ResolveNode* resolve = static_cast<ResolveNode*>(loc); if (op == OpEqual) { - AssignResolveNode* node = new AssignResolveNode(GLOBAL_DATA, resolve->identifier(), expr, exprHasAssignments); + AssignResolveNode* node = new (GLOBAL_DATA) AssignResolveNode(GLOBAL_DATA, resolve->identifier(), expr, exprHasAssignments); SET_EXCEPTION_LOCATION(node, start, divot, end); return node; } else - return new ReadModifyResolveNode(GLOBAL_DATA, resolve->identifier(), op, expr, exprHasAssignments, divot, divot - start, end - divot); + return new (GLOBAL_DATA) ReadModifyResolveNode(GLOBAL_DATA, resolve->identifier(), op, expr, exprHasAssignments, divot, divot - start, end - divot); } if (loc->isBracketAccessorNode()) { BracketAccessorNode* bracket = static_cast<BracketAccessorNode*>(loc); if (op == OpEqual) - return new AssignBracketNode(GLOBAL_DATA, bracket->base(), bracket->subscript(), expr, locHasAssignments, exprHasAssignments, bracket->divot(), bracket->divot() - start, end - bracket->divot()); + return new (GLOBAL_DATA) AssignBracketNode(GLOBAL_DATA, bracket->base(), bracket->subscript(), expr, locHasAssignments, exprHasAssignments, bracket->divot(), bracket->divot() - start, end - bracket->divot()); else { - ReadModifyBracketNode* node = new ReadModifyBracketNode(GLOBAL_DATA, bracket->base(), bracket->subscript(), op, expr, locHasAssignments, exprHasAssignments, divot, divot - start, end - divot); + ReadModifyBracketNode* node = new (GLOBAL_DATA) ReadModifyBracketNode(GLOBAL_DATA, bracket->base(), bracket->subscript(), op, expr, locHasAssignments, exprHasAssignments, divot, divot - start, end - divot); node->setSubexpressionInfo(bracket->divot(), bracket->endOffset()); return node; } @@ -4873,9 +5356,9 @@ static ExpressionNode* makeAssignNode(void* globalPtr, ExpressionNode* loc, Oper ASSERT(loc->isDotAccessorNode()); DotAccessorNode* dot = static_cast<DotAccessorNode*>(loc); if (op == OpEqual) - return new AssignDotNode(GLOBAL_DATA, dot->base(), dot->identifier(), expr, exprHasAssignments, dot->divot(), dot->divot() - start, end - dot->divot()); + return new (GLOBAL_DATA) AssignDotNode(GLOBAL_DATA, dot->base(), dot->identifier(), expr, exprHasAssignments, dot->divot(), dot->divot() - start, end - dot->divot()); - ReadModifyDotNode* node = new ReadModifyDotNode(GLOBAL_DATA, dot->base(), dot->identifier(), op, expr, exprHasAssignments, divot, divot - start, end - divot); + ReadModifyDotNode* node = new (GLOBAL_DATA) ReadModifyDotNode(GLOBAL_DATA, dot->base(), dot->identifier(), op, expr, exprHasAssignments, divot, divot - start, end - divot); node->setSubexpressionInfo(dot->divot(), dot->endOffset()); return node; } @@ -4883,21 +5366,21 @@ static ExpressionNode* makeAssignNode(void* globalPtr, ExpressionNode* loc, Oper static ExpressionNode* makePrefixNode(void* globalPtr, ExpressionNode* expr, Operator op, int start, int divot, int end) { if (!expr->isLocation()) - return new PrefixErrorNode(GLOBAL_DATA, expr, op, divot, divot - start, end - divot); + return new (GLOBAL_DATA) PrefixErrorNode(GLOBAL_DATA, expr, op, divot, divot - start, end - divot); if (expr->isResolveNode()) { ResolveNode* resolve = static_cast<ResolveNode*>(expr); - return new PrefixResolveNode(GLOBAL_DATA, resolve->identifier(), op, divot, divot - start, end - divot); + return new (GLOBAL_DATA) PrefixResolveNode(GLOBAL_DATA, resolve->identifier(), op, divot, divot - start, end - divot); } if (expr->isBracketAccessorNode()) { BracketAccessorNode* bracket = static_cast<BracketAccessorNode*>(expr); - PrefixBracketNode* node = new PrefixBracketNode(GLOBAL_DATA, bracket->base(), bracket->subscript(), op, divot, divot - start, end - divot); + PrefixBracketNode* node = new (GLOBAL_DATA) PrefixBracketNode(GLOBAL_DATA, bracket->base(), bracket->subscript(), op, divot, divot - start, end - divot); node->setSubexpressionInfo(bracket->divot(), bracket->startOffset()); return node; } ASSERT(expr->isDotAccessorNode()); DotAccessorNode* dot = static_cast<DotAccessorNode*>(expr); - PrefixDotNode* node = new PrefixDotNode(GLOBAL_DATA, dot->base(), dot->identifier(), op, divot, divot - start, end - divot); + PrefixDotNode* node = new (GLOBAL_DATA) PrefixDotNode(GLOBAL_DATA, dot->base(), dot->identifier(), op, divot, divot - start, end - divot); node->setSubexpressionInfo(dot->divot(), dot->startOffset()); return node; } @@ -4905,22 +5388,22 @@ static ExpressionNode* makePrefixNode(void* globalPtr, ExpressionNode* expr, Ope static ExpressionNode* makePostfixNode(void* globalPtr, ExpressionNode* expr, Operator op, int start, int divot, int end) { if (!expr->isLocation()) - return new PostfixErrorNode(GLOBAL_DATA, expr, op, divot, divot - start, end - divot); + return new (GLOBAL_DATA) PostfixErrorNode(GLOBAL_DATA, expr, op, divot, divot - start, end - divot); if (expr->isResolveNode()) { ResolveNode* resolve = static_cast<ResolveNode*>(expr); - return new PostfixResolveNode(GLOBAL_DATA, resolve->identifier(), op, divot, divot - start, end - divot); + return new (GLOBAL_DATA) PostfixResolveNode(GLOBAL_DATA, resolve->identifier(), op, divot, divot - start, end - divot); } if (expr->isBracketAccessorNode()) { BracketAccessorNode* bracket = static_cast<BracketAccessorNode*>(expr); - PostfixBracketNode* node = new PostfixBracketNode(GLOBAL_DATA, bracket->base(), bracket->subscript(), op, divot, divot - start, end - divot); + PostfixBracketNode* node = new (GLOBAL_DATA) PostfixBracketNode(GLOBAL_DATA, bracket->base(), bracket->subscript(), op, divot, divot - start, end - divot); node->setSubexpressionInfo(bracket->divot(), bracket->endOffset()); return node; } ASSERT(expr->isDotAccessorNode()); DotAccessorNode* dot = static_cast<DotAccessorNode*>(expr); - PostfixDotNode* node = new PostfixDotNode(GLOBAL_DATA, dot->base(), dot->identifier(), op, divot, divot - start, end - divot); + PostfixDotNode* node = new (GLOBAL_DATA) PostfixDotNode(GLOBAL_DATA, dot->base(), dot->identifier(), op, divot, divot - start, end - divot); node->setSubexpressionInfo(dot->divot(), dot->endOffset()); return node; } @@ -4930,23 +5413,29 @@ static ExpressionNodeInfo makeFunctionCallNode(void* globalPtr, ExpressionNodeIn CodeFeatures features = func.m_features | args.m_features; int numConstants = func.m_numConstants + args.m_numConstants; if (!func.m_node->isLocation()) - return createNodeInfo<ExpressionNode*>(new FunctionCallValueNode(GLOBAL_DATA, func.m_node, args.m_node, divot, divot - start, end - divot), features, numConstants); + return createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) FunctionCallValueNode(GLOBAL_DATA, func.m_node, args.m_node, divot, divot - start, end - divot), features, numConstants); if (func.m_node->isResolveNode()) { ResolveNode* resolve = static_cast<ResolveNode*>(func.m_node); const Identifier& identifier = resolve->identifier(); if (identifier == GLOBAL_DATA->propertyNames->eval) - return createNodeInfo<ExpressionNode*>(new EvalFunctionCallNode(GLOBAL_DATA, args.m_node, divot, divot - start, end - divot), EvalFeature | features, numConstants); - return createNodeInfo<ExpressionNode*>(new FunctionCallResolveNode(GLOBAL_DATA, identifier, args.m_node, divot, divot - start, end - divot), features, numConstants); + return createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) EvalFunctionCallNode(GLOBAL_DATA, args.m_node, divot, divot - start, end - divot), EvalFeature | features, numConstants); + return createNodeInfo<ExpressionNode*>(new (GLOBAL_DATA) FunctionCallResolveNode(GLOBAL_DATA, identifier, args.m_node, divot, divot - start, end - divot), features, numConstants); } if (func.m_node->isBracketAccessorNode()) { BracketAccessorNode* bracket = static_cast<BracketAccessorNode*>(func.m_node); - FunctionCallBracketNode* node = new FunctionCallBracketNode(GLOBAL_DATA, bracket->base(), bracket->subscript(), args.m_node, divot, divot - start, end - divot); + FunctionCallBracketNode* node = new (GLOBAL_DATA) FunctionCallBracketNode(GLOBAL_DATA, bracket->base(), bracket->subscript(), args.m_node, divot, divot - start, end - divot); node->setSubexpressionInfo(bracket->divot(), bracket->endOffset()); return createNodeInfo<ExpressionNode*>(node, features, numConstants); } ASSERT(func.m_node->isDotAccessorNode()); DotAccessorNode* dot = static_cast<DotAccessorNode*>(func.m_node); - FunctionCallDotNode* node = new FunctionCallDotNode(GLOBAL_DATA, dot->base(), dot->identifier(), args.m_node, divot, divot - start, end - divot); + FunctionCallDotNode* node; + if (dot->identifier() == GLOBAL_DATA->propertyNames->call) + node = new (GLOBAL_DATA) CallFunctionCallDotNode(GLOBAL_DATA, dot->base(), dot->identifier(), args.m_node, divot, divot - start, end - divot); + else if (dot->identifier() == GLOBAL_DATA->propertyNames->apply) + node = new (GLOBAL_DATA) ApplyFunctionCallDotNode(GLOBAL_DATA, dot->base(), dot->identifier(), args.m_node, divot, divot - start, end - divot); + else + node = new (GLOBAL_DATA) FunctionCallDotNode(GLOBAL_DATA, dot->base(), dot->identifier(), args.m_node, divot, divot - start, end - divot); node->setSubexpressionInfo(dot->divot(), dot->endOffset()); return createNodeInfo<ExpressionNode*>(node, features, numConstants); } @@ -4955,26 +5444,26 @@ static ExpressionNode* makeTypeOfNode(void* globalPtr, ExpressionNode* expr) { if (expr->isResolveNode()) { ResolveNode* resolve = static_cast<ResolveNode*>(expr); - return new TypeOfResolveNode(GLOBAL_DATA, resolve->identifier()); + return new (GLOBAL_DATA) TypeOfResolveNode(GLOBAL_DATA, resolve->identifier()); } - return new TypeOfValueNode(GLOBAL_DATA, expr); + return new (GLOBAL_DATA) TypeOfValueNode(GLOBAL_DATA, expr); } static ExpressionNode* makeDeleteNode(void* globalPtr, ExpressionNode* expr, int start, int divot, int end) { if (!expr->isLocation()) - return new DeleteValueNode(GLOBAL_DATA, expr); + return new (GLOBAL_DATA) DeleteValueNode(GLOBAL_DATA, expr); if (expr->isResolveNode()) { ResolveNode* resolve = static_cast<ResolveNode*>(expr); - return new DeleteResolveNode(GLOBAL_DATA, resolve->identifier(), divot, divot - start, end - divot); + return new (GLOBAL_DATA) DeleteResolveNode(GLOBAL_DATA, resolve->identifier(), divot, divot - start, end - divot); } if (expr->isBracketAccessorNode()) { BracketAccessorNode* bracket = static_cast<BracketAccessorNode*>(expr); - return new DeleteBracketNode(GLOBAL_DATA, bracket->base(), bracket->subscript(), divot, divot - start, end - divot); + return new (GLOBAL_DATA) DeleteBracketNode(GLOBAL_DATA, bracket->base(), bracket->subscript(), divot, divot - start, end - divot); } ASSERT(expr->isDotAccessorNode()); DotAccessorNode* dot = static_cast<DotAccessorNode*>(expr); - return new DeleteDotNode(GLOBAL_DATA, dot->base(), dot->identifier(), divot, divot - start, end - divot); + return new (GLOBAL_DATA) DeleteDotNode(GLOBAL_DATA, dot->base(), dot->identifier(), divot, divot - start, end - divot); } static PropertyNode* makeGetterOrSetterPropertyNode(void* globalPtr, const Identifier& getOrSet, const Identifier& name, ParameterNode* params, FunctionBodyNode* body, const SourceCode& source) @@ -4986,7 +5475,7 @@ static PropertyNode* makeGetterOrSetterPropertyNode(void* globalPtr, const Ident type = PropertyNode::Setter; else return 0; - return new PropertyNode(GLOBAL_DATA, name, new FuncExprNode(GLOBAL_DATA, GLOBAL_DATA->propertyNames->nullIdentifier, body, source, params), type); + return new (GLOBAL_DATA) PropertyNode(GLOBAL_DATA, name, new FuncExprNode(GLOBAL_DATA, GLOBAL_DATA->propertyNames->nullIdentifier, body, source, params), type); } static ExpressionNode* makeNegateNode(void* globalPtr, ExpressionNode* n) @@ -5000,19 +5489,19 @@ static ExpressionNode* makeNegateNode(void* globalPtr, ExpressionNode* n) } } - return new NegateNode(GLOBAL_DATA, n); + return new (GLOBAL_DATA) NegateNode(GLOBAL_DATA, n); } static NumberNode* makeNumberNode(void* globalPtr, double d) { - return new NumberNode(GLOBAL_DATA, d); + return new (GLOBAL_DATA) NumberNode(GLOBAL_DATA, d); } static ExpressionNode* makeBitwiseNotNode(void* globalPtr, ExpressionNode* expr) { if (expr->isNumber()) return makeNumberNode(globalPtr, ~toInt32(static_cast<NumberNode*>(expr)->value())); - return new BitwiseNotNode(GLOBAL_DATA, expr); + return new (GLOBAL_DATA) BitwiseNotNode(GLOBAL_DATA, expr); } static ExpressionNode* makeMultNode(void* globalPtr, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) @@ -5024,12 +5513,12 @@ static ExpressionNode* makeMultNode(void* globalPtr, ExpressionNode* expr1, Expr return makeNumberNode(globalPtr, static_cast<NumberNode*>(expr1)->value() * static_cast<NumberNode*>(expr2)->value()); if (expr1->isNumber() && static_cast<NumberNode*>(expr1)->value() == 1) - return new UnaryPlusNode(GLOBAL_DATA, expr2); + return new (GLOBAL_DATA) UnaryPlusNode(GLOBAL_DATA, expr2); if (expr2->isNumber() && static_cast<NumberNode*>(expr2)->value() == 1) - return new UnaryPlusNode(GLOBAL_DATA, expr1); + return new (GLOBAL_DATA) UnaryPlusNode(GLOBAL_DATA, expr1); - return new MultNode(GLOBAL_DATA, expr1, expr2, rightHasAssignments); + return new (GLOBAL_DATA) MultNode(GLOBAL_DATA, expr1, expr2, rightHasAssignments); } static ExpressionNode* makeDivNode(void* globalPtr, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) @@ -5039,14 +5528,14 @@ static ExpressionNode* makeDivNode(void* globalPtr, ExpressionNode* expr1, Expre if (expr1->isNumber() && expr2->isNumber()) return makeNumberNode(globalPtr, static_cast<NumberNode*>(expr1)->value() / static_cast<NumberNode*>(expr2)->value()); - return new DivNode(GLOBAL_DATA, expr1, expr2, rightHasAssignments); + return new (GLOBAL_DATA) DivNode(GLOBAL_DATA, expr1, expr2, rightHasAssignments); } static ExpressionNode* makeAddNode(void* globalPtr, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) { if (expr1->isNumber() && expr2->isNumber()) return makeNumberNode(globalPtr, static_cast<NumberNode*>(expr1)->value() + static_cast<NumberNode*>(expr2)->value()); - return new AddNode(GLOBAL_DATA, expr1, expr2, rightHasAssignments); + return new (GLOBAL_DATA) AddNode(GLOBAL_DATA, expr1, expr2, rightHasAssignments); } static ExpressionNode* makeSubNode(void* globalPtr, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) @@ -5056,21 +5545,21 @@ static ExpressionNode* makeSubNode(void* globalPtr, ExpressionNode* expr1, Expre if (expr1->isNumber() && expr2->isNumber()) return makeNumberNode(globalPtr, static_cast<NumberNode*>(expr1)->value() - static_cast<NumberNode*>(expr2)->value()); - return new SubNode(GLOBAL_DATA, expr1, expr2, rightHasAssignments); + return new (GLOBAL_DATA) SubNode(GLOBAL_DATA, expr1, expr2, rightHasAssignments); } static ExpressionNode* makeLeftShiftNode(void* globalPtr, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) { if (expr1->isNumber() && expr2->isNumber()) return makeNumberNode(globalPtr, toInt32(static_cast<NumberNode*>(expr1)->value()) << (toUInt32(static_cast<NumberNode*>(expr2)->value()) & 0x1f)); - return new LeftShiftNode(GLOBAL_DATA, expr1, expr2, rightHasAssignments); + return new (GLOBAL_DATA) LeftShiftNode(GLOBAL_DATA, expr1, expr2, rightHasAssignments); } static ExpressionNode* makeRightShiftNode(void* globalPtr, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) { if (expr1->isNumber() && expr2->isNumber()) return makeNumberNode(globalPtr, toInt32(static_cast<NumberNode*>(expr1)->value()) >> (toUInt32(static_cast<NumberNode*>(expr2)->value()) & 0x1f)); - return new RightShiftNode(GLOBAL_DATA, expr1, expr2, rightHasAssignments); + return new (GLOBAL_DATA) RightShiftNode(GLOBAL_DATA, expr1, expr2, rightHasAssignments); } /* called by yyparse on error */ @@ -5089,7 +5578,7 @@ static ExpressionNode* combineVarInitializers(void* globalPtr, ExpressionNode* l { if (!list) return init; - return new VarDeclCommaNode(GLOBAL_DATA, list, init); + return new (GLOBAL_DATA) CommaNode(GLOBAL_DATA, list, init); } // We turn variable declarations into either assignments or empty @@ -5098,8 +5587,8 @@ static ExpressionNode* combineVarInitializers(void* globalPtr, ExpressionNode* l static StatementNode* makeVarStatementNode(void* globalPtr, ExpressionNode* expr) { if (!expr) - return new EmptyStatementNode(GLOBAL_DATA); - return new VarStatementNode(GLOBAL_DATA, expr); + return new (GLOBAL_DATA) EmptyStatementNode(GLOBAL_DATA); + return new (GLOBAL_DATA) VarStatementNode(GLOBAL_DATA, expr); } #undef GLOBAL_DATA diff --git a/src/3rdparty/webkit/WebCore/generated/Grammar.h b/src/3rdparty/webkit/WebCore/generated/Grammar.h index 4805844aba..34b0b37d59 100644 --- a/src/3rdparty/webkit/WebCore/generated/Grammar.h +++ b/src/3rdparty/webkit/WebCore/generated/Grammar.h @@ -1,24 +1,23 @@ -/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton interface for Bison's Yacc-like parsers in C +/* A Bison parser, made by GNU Bison 2.4.1. */ - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +/* Skeleton interface for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -29,10 +28,11 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ + /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -104,78 +104,16 @@ AUTOMINUSMINUS = 320 }; #endif -/* Tokens. */ -#define NULLTOKEN 258 -#define TRUETOKEN 259 -#define FALSETOKEN 260 -#define BREAK 261 -#define CASE 262 -#define DEFAULT 263 -#define FOR 264 -#define NEW 265 -#define VAR 266 -#define CONSTTOKEN 267 -#define CONTINUE 268 -#define FUNCTION 269 -#define RETURN 270 -#define VOIDTOKEN 271 -#define DELETETOKEN 272 -#define IF 273 -#define THISTOKEN 274 -#define DO 275 -#define WHILE 276 -#define INTOKEN 277 -#define INSTANCEOF 278 -#define TYPEOF 279 -#define SWITCH 280 -#define WITH 281 -#define RESERVED 282 -#define THROW 283 -#define TRY 284 -#define CATCH 285 -#define FINALLY 286 -#define DEBUGGER 287 -#define IF_WITHOUT_ELSE 288 -#define ELSE 289 -#define EQEQ 290 -#define NE 291 -#define STREQ 292 -#define STRNEQ 293 -#define LE 294 -#define GE 295 -#define OR 296 -#define AND 297 -#define PLUSPLUS 298 -#define MINUSMINUS 299 -#define LSHIFT 300 -#define RSHIFT 301 -#define URSHIFT 302 -#define PLUSEQUAL 303 -#define MINUSEQUAL 304 -#define MULTEQUAL 305 -#define DIVEQUAL 306 -#define LSHIFTEQUAL 307 -#define RSHIFTEQUAL 308 -#define URSHIFTEQUAL 309 -#define ANDEQUAL 310 -#define MODEQUAL 311 -#define XOREQUAL 312 -#define OREQUAL 313 -#define OPENBRACE 314 -#define CLOSEBRACE 315 -#define NUMBER 316 -#define IDENT 317 -#define STRING 318 -#define AUTOPLUSPLUS 319 -#define AUTOMINUSMINUS 320 - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 157 "../../JavaScriptCore/parser/Grammar.y" { + +/* Line 1676 of yacc.c */ +#line 157 "../../JavaScriptCore/parser/Grammar.y" + int intValue; double doubleValue; Identifier* ident; @@ -205,13 +143,15 @@ typedef union YYSTYPE ParameterListInfo parameterList; Operator op; -} -/* Line 1489 of yacc.c. */ -#line 211 "Grammar.tab.h" - YYSTYPE; + + + +/* Line 1676 of yacc.c */ +#line 151 "WebCore/tmp/../generated/Grammar.tab.h" +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif @@ -230,3 +170,4 @@ typedef struct YYLTYPE #endif + diff --git a/src/3rdparty/webkit/WebCore/generated/HTMLElementFactory.cpp b/src/3rdparty/webkit/WebCore/generated/HTMLElementFactory.cpp new file mode 100644 index 0000000000..590c238f28 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/HTMLElementFactory.cpp @@ -0,0 +1,546 @@ +/* + * THIS FILE IS AUTOMATICALLY GENERATED, DO NOT EDIT. + * + * + * Copyright (C) 2005 Apple Computer, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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 APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. + */ + + +#include "config.h" +#include "HTMLElementFactory.h" + +#include "HTMLNames.h" +#if ENABLE(DASHBOARD_SUPPORT) +#include "Document.h" +#include "Settings.h" +#endif + +#include "HTMLFormElement.h" +#include "HTMLAnchorElement.h" +#include "HTMLElement.h" +#include "HTMLAppletElement.h" +#include "HTMLAreaElement.h" +#include "HTMLAudioElement.h" +#include "HTMLBaseElement.h" +#include "HTMLBaseFontElement.h" +#include "HTMLBlockquoteElement.h" +#include "HTMLBodyElement.h" +#include "HTMLBRElement.h" +#include "HTMLButtonElement.h" +#include "HTMLCanvasElement.h" +#include "HTMLTableCaptionElement.h" +#include "HTMLTableColElement.h" +#include "HTMLModElement.h" +#include "HTMLDirectoryElement.h" +#include "HTMLDivElement.h" +#include "HTMLDListElement.h" +#include "HTMLEmbedElement.h" +#include "HTMLFieldSetElement.h" +#include "HTMLFontElement.h" +#include "HTMLFormElement.h" +#include "HTMLFrameElement.h" +#include "HTMLFrameSetElement.h" +#include "HTMLHeadingElement.h" +#include "HTMLHeadElement.h" +#include "HTMLHRElement.h" +#include "HTMLHtmlElement.h" +#include "HTMLIFrameElement.h" +#include "HTMLImageElement.h" +#include "HTMLInputElement.h" +#include "HTMLIsIndexElement.h" +#include "HTMLKeygenElement.h" +#include "HTMLLabelElement.h" +#include "HTMLLegendElement.h" +#include "HTMLLIElement.h" +#include "HTMLLinkElement.h" +#include "HTMLPreElement.h" +#include "HTMLMapElement.h" +#include "HTMLMarqueeElement.h" +#include "HTMLMenuElement.h" +#include "HTMLMetaElement.h" +#include "HTMLObjectElement.h" +#include "HTMLOListElement.h" +#include "HTMLOptGroupElement.h" +#include "HTMLOptionElement.h" +#include "HTMLParagraphElement.h" +#include "HTMLParamElement.h" +#include "HTMLQuoteElement.h" +#include "HTMLScriptElement.h" +#include "HTMLSelectElement.h" +#include "HTMLSourceElement.h" +#include "HTMLStyleElement.h" +#include "HTMLTableElement.h" +#include "HTMLTableSectionElement.h" +#include "HTMLTableCellElement.h" +#include "HTMLTextAreaElement.h" +#include "HTMLTitleElement.h" +#include "HTMLTableRowElement.h" +#include "HTMLUListElement.h" +#include "HTMLVideoElement.h" +#include <wtf/HashMap.h> + +namespace WebCore { + +using namespace HTMLNames; + +typedef PassRefPtr<HTMLElement> (*ConstructorFunction)(const QualifiedName&, Document*, HTMLFormElement*, bool createdByParser); +typedef HashMap<AtomicStringImpl*, ConstructorFunction> FunctionMap; + +static FunctionMap* gFunctionMap = 0; + +static PassRefPtr<HTMLElement> anchorConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLAnchorElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> appletConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLAppletElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> areaConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLAreaElement(tagName, doc); +} + +#if ENABLE(VIDEO) + +static PassRefPtr<HTMLElement> audioConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + if (!MediaPlayer::isAvailable()) + return new HTMLElement(tagName, doc); + return new HTMLAudioElement(tagName, doc); +} + +#endif + +static PassRefPtr<HTMLElement> baseConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLBaseElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> basefontConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLBaseFontElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> blockquoteConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLBlockquoteElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> bodyConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLBodyElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> brConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLBRElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> buttonConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement* formElement, bool) +{ + return new HTMLButtonElement(tagName, doc, formElement); +} + +static PassRefPtr<HTMLElement> canvasConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLCanvasElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> tablecaptionConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLTableCaptionElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> tablecolConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLTableColElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> modConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLModElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> directoryConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLDirectoryElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> divConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLDivElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> dlistConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLDListElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> embedConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLEmbedElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> fieldsetConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement* formElement, bool) +{ + return new HTMLFieldSetElement(tagName, doc, formElement); +} + +static PassRefPtr<HTMLElement> fontConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLFontElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> formConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLFormElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> frameConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLFrameElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> framesetConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLFrameSetElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> headingConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLHeadingElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> headConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLHeadElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> hrConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLHRElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> htmlConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLHtmlElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> iframeConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLIFrameElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> imageConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement* formElement, bool) +{ + return new HTMLImageElement(tagName, doc, formElement); +} + +static PassRefPtr<HTMLElement> inputConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement* formElement, bool) +{ + return new HTMLInputElement(tagName, doc, formElement); +} + +static PassRefPtr<HTMLElement> isindexConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement* formElement, bool) +{ + return new HTMLIsIndexElement(tagName, doc, formElement); +} + +static PassRefPtr<HTMLElement> keygenConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement* formElement, bool) +{ + return new HTMLKeygenElement(tagName, doc, formElement); +} + +static PassRefPtr<HTMLElement> labelConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLLabelElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> legendConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement* formElement, bool) +{ + return new HTMLLegendElement(tagName, doc, formElement); +} + +static PassRefPtr<HTMLElement> liConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLLIElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> linkConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool createdByParser) +{ + return new HTMLLinkElement(tagName, doc, createdByParser); +} + +static PassRefPtr<HTMLElement> preConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLPreElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> mapConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLMapElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> marqueeConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLMarqueeElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> menuConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLMenuElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> metaConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLMetaElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> objectConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool createdByParser) +{ + return new HTMLObjectElement(tagName, doc, createdByParser); +} + +static PassRefPtr<HTMLElement> olistConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLOListElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> optgroupConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement* formElement, bool) +{ + return new HTMLOptGroupElement(tagName, doc, formElement); +} + +static PassRefPtr<HTMLElement> optionConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement* formElement, bool) +{ + return new HTMLOptionElement(tagName, doc, formElement); +} + +static PassRefPtr<HTMLElement> paragraphConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLParagraphElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> paramConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLParamElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> quoteConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLQuoteElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> scriptConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool createdByParser) +{ + return new HTMLScriptElement(tagName, doc, createdByParser); +} + +static PassRefPtr<HTMLElement> selectConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement* formElement, bool) +{ + return new HTMLSelectElement(tagName, doc, formElement); +} + +#if ENABLE(VIDEO) + +static PassRefPtr<HTMLElement> sourceConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + if (!MediaPlayer::isAvailable()) + return new HTMLElement(tagName, doc); + return new HTMLSourceElement(tagName, doc); +} + +#endif + +static PassRefPtr<HTMLElement> styleConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool createdByParser) +{ + return new HTMLStyleElement(tagName, doc, createdByParser); +} + +static PassRefPtr<HTMLElement> tableConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLTableElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> tablesectionConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLTableSectionElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> tablecellConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLTableCellElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> textareaConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement* formElement, bool) +{ + return new HTMLTextAreaElement(tagName, doc, formElement); +} + +static PassRefPtr<HTMLElement> titleConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLTitleElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> tablerowConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLTableRowElement(tagName, doc); +} + +static PassRefPtr<HTMLElement> ulistConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + return new HTMLUListElement(tagName, doc); +} + +#if ENABLE(VIDEO) + +static PassRefPtr<HTMLElement> videoConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement*, bool) +{ + if (!MediaPlayer::isAvailable()) + return new HTMLElement(tagName, doc); + return new HTMLVideoElement(tagName, doc); +} + +#endif + +static PassRefPtr<HTMLElement> imgToimageConstructor(const QualifiedName& tagName, Document* doc, HTMLFormElement* formElement, bool) +{ + return new HTMLImageElement(QualifiedName(tagName.prefix(), imgTag.localName(), tagName.namespaceURI()), doc, formElement); +} + +static void addTag(const QualifiedName& tag, ConstructorFunction func) +{ + gFunctionMap->set(tag.localName().impl(), func); +} + +static inline void createFunctionMapIfNecessary() +{ + if (gFunctionMap) + return; + // Create the table. + gFunctionMap = new FunctionMap; + + // Populate it with constructor functions. + addTag(aTag, anchorConstructor); + addTag(appletTag, appletConstructor); + addTag(areaTag, areaConstructor); +#if ENABLE(VIDEO) + addTag(audioTag, audioConstructor); +#endif + + addTag(baseTag, baseConstructor); + addTag(basefontTag, basefontConstructor); + addTag(blockquoteTag, blockquoteConstructor); + addTag(bodyTag, bodyConstructor); + addTag(brTag, brConstructor); + addTag(buttonTag, buttonConstructor); + addTag(canvasTag, canvasConstructor); + addTag(captionTag, tablecaptionConstructor); + addTag(colTag, tablecolConstructor); + addTag(colgroupTag, tablecolConstructor); + addTag(delTag, modConstructor); + addTag(dirTag, directoryConstructor); + addTag(divTag, divConstructor); + addTag(dlTag, dlistConstructor); + addTag(embedTag, embedConstructor); + addTag(fieldsetTag, fieldsetConstructor); + addTag(fontTag, fontConstructor); + addTag(formTag, formConstructor); + addTag(frameTag, frameConstructor); + addTag(framesetTag, framesetConstructor); + addTag(h1Tag, headingConstructor); + addTag(h2Tag, headingConstructor); + addTag(h3Tag, headingConstructor); + addTag(h4Tag, headingConstructor); + addTag(h5Tag, headingConstructor); + addTag(h6Tag, headingConstructor); + addTag(headTag, headConstructor); + addTag(hrTag, hrConstructor); + addTag(htmlTag, htmlConstructor); + addTag(iframeTag, iframeConstructor); + addTag(imageTag, imgToimageConstructor); + addTag(imgTag, imageConstructor); + addTag(inputTag, inputConstructor); + addTag(insTag, modConstructor); + addTag(isindexTag, isindexConstructor); + addTag(keygenTag, keygenConstructor); + addTag(labelTag, labelConstructor); + addTag(legendTag, legendConstructor); + addTag(liTag, liConstructor); + addTag(linkTag, linkConstructor); + addTag(listingTag, preConstructor); + addTag(mapTag, mapConstructor); + addTag(marqueeTag, marqueeConstructor); + addTag(menuTag, menuConstructor); + addTag(metaTag, metaConstructor); + addTag(objectTag, objectConstructor); + addTag(olTag, olistConstructor); + addTag(optgroupTag, optgroupConstructor); + addTag(optionTag, optionConstructor); + addTag(pTag, paragraphConstructor); + addTag(paramTag, paramConstructor); + addTag(preTag, preConstructor); + addTag(qTag, quoteConstructor); + addTag(scriptTag, scriptConstructor); + addTag(selectTag, selectConstructor); +#if ENABLE(VIDEO) + addTag(sourceTag, sourceConstructor); +#endif + + addTag(styleTag, styleConstructor); + addTag(tableTag, tableConstructor); + addTag(tbodyTag, tablesectionConstructor); + addTag(tdTag, tablecellConstructor); + addTag(textareaTag, textareaConstructor); + addTag(tfootTag, tablesectionConstructor); + addTag(thTag, tablecellConstructor); + addTag(theadTag, tablesectionConstructor); + addTag(titleTag, titleConstructor); + addTag(trTag, tablerowConstructor); + addTag(ulTag, ulistConstructor); +#if ENABLE(VIDEO) + addTag(videoTag, videoConstructor); +#endif + + addTag(xmpTag, preConstructor); +} + +PassRefPtr<HTMLElement> HTMLElementFactory::createHTMLElement(const QualifiedName& qName, Document* doc, HTMLFormElement* formElement, bool createdByParser) +{ + // Don't make elements without a document + if (!doc) + return 0; + + createFunctionMapIfNecessary(); + ConstructorFunction func = gFunctionMap->get(qName.localName().impl()); + if (func) + return func(qName, doc, formElement, createdByParser); + return new HTMLElement(qName, doc); +} + +} // namespace WebCore + diff --git a/src/3rdparty/webkit/WebCore/generated/HTMLElementFactory.h b/src/3rdparty/webkit/WebCore/generated/HTMLElementFactory.h new file mode 100644 index 0000000000..566d9cd2e3 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/HTMLElementFactory.h @@ -0,0 +1,56 @@ +/* + * THIS FILE IS AUTOMATICALLY GENERATED, DO NOT EDIT. + * + * + * Copyright (C) 2005 Apple Computer, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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 APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. + */ + + +#ifndef HTMLElementFactory_h +#define HTMLElementFactory_h + +#include <wtf/PassRefPtr.h> + +namespace WebCore { + class Element; + class Document; + class QualifiedName; + class AtomicString; +} + +namespace WebCore { + + class HTMLElement; + class HTMLFormElement; + // The idea behind this class is that there will eventually be a mapping from namespace URIs to ElementFactories that can dispense + // elements. In a compound document world, the generic createElement function (will end up being virtual) will be called. + class HTMLElementFactory { + public: + PassRefPtr<Element> createElement(const WebCore::QualifiedName&, WebCore::Document*, bool createdByParser = true); + static PassRefPtr<HTMLElement> createHTMLElement(const WebCore::QualifiedName&, WebCore::Document*, HTMLFormElement* = 0, bool /*createdByParser*/ = true); + }; +} + +#endif // HTMLElementFactory_h + diff --git a/src/3rdparty/webkit/WebCore/generated/HTMLNames.cpp b/src/3rdparty/webkit/WebCore/generated/HTMLNames.cpp index 713c370598..84c48c0d53 100644 --- a/src/3rdparty/webkit/WebCore/generated/HTMLNames.cpp +++ b/src/3rdparty/webkit/WebCore/generated/HTMLNames.cpp @@ -289,6 +289,7 @@ DEFINE_GLOBAL(QualifiedName, aria_pressedAttr, nullAtom, "aria_pressed", xhtmlNa DEFINE_GLOBAL(QualifiedName, aria_valuemaxAttr, nullAtom, "aria_valuemax", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, aria_valueminAttr, nullAtom, "aria_valuemin", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, aria_valuenowAttr, nullAtom, "aria_valuenow", xhtmlNamespaceURI); +DEFINE_GLOBAL(QualifiedName, autobufferAttr, nullAtom, "autobuffer", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, autocompleteAttr, nullAtom, "autocomplete", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, autofocusAttr, nullAtom, "autofocus", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, autoplayAttr, nullAtom, "autoplay", xhtmlNamespaceURI); @@ -406,6 +407,8 @@ DEFINE_GLOBAL(QualifiedName, onmouseoutAttr, nullAtom, "onmouseout", xhtmlNamesp DEFINE_GLOBAL(QualifiedName, onmouseoverAttr, nullAtom, "onmouseover", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, onmouseupAttr, nullAtom, "onmouseup", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, onmousewheelAttr, nullAtom, "onmousewheel", xhtmlNamespaceURI); +DEFINE_GLOBAL(QualifiedName, onofflineAttr, nullAtom, "onoffline", xhtmlNamespaceURI); +DEFINE_GLOBAL(QualifiedName, ononlineAttr, nullAtom, "ononline", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, onpasteAttr, nullAtom, "onpaste", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, onresetAttr, nullAtom, "onreset", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, onresizeAttr, nullAtom, "onresize", xhtmlNamespaceURI); @@ -444,6 +447,7 @@ DEFINE_GLOBAL(QualifiedName, selectedAttr, nullAtom, "selected", xhtmlNamespaceU DEFINE_GLOBAL(QualifiedName, shapeAttr, nullAtom, "shape", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, sizeAttr, nullAtom, "size", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, spanAttr, nullAtom, "span", xhtmlNamespaceURI); +DEFINE_GLOBAL(QualifiedName, spellcheckAttr, nullAtom, "spellcheck", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, srcAttr, nullAtom, "src", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, standbyAttr, nullAtom, "standby", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, startAttr, nullAtom, "start", xhtmlNamespaceURI); @@ -492,6 +496,7 @@ WebCore::QualifiedName** getHTMLAttrs(size_t* size) (WebCore::QualifiedName*)&aria_valuemaxAttr, (WebCore::QualifiedName*)&aria_valueminAttr, (WebCore::QualifiedName*)&aria_valuenowAttr, + (WebCore::QualifiedName*)&autobufferAttr, (WebCore::QualifiedName*)&autocompleteAttr, (WebCore::QualifiedName*)&autofocusAttr, (WebCore::QualifiedName*)&autoplayAttr, @@ -609,6 +614,8 @@ WebCore::QualifiedName** getHTMLAttrs(size_t* size) (WebCore::QualifiedName*)&onmouseoverAttr, (WebCore::QualifiedName*)&onmouseupAttr, (WebCore::QualifiedName*)&onmousewheelAttr, + (WebCore::QualifiedName*)&onofflineAttr, + (WebCore::QualifiedName*)&ononlineAttr, (WebCore::QualifiedName*)&onpasteAttr, (WebCore::QualifiedName*)&onresetAttr, (WebCore::QualifiedName*)&onresizeAttr, @@ -647,6 +654,7 @@ WebCore::QualifiedName** getHTMLAttrs(size_t* size) (WebCore::QualifiedName*)&shapeAttr, (WebCore::QualifiedName*)&sizeAttr, (WebCore::QualifiedName*)&spanAttr, + (WebCore::QualifiedName*)&spellcheckAttr, (WebCore::QualifiedName*)&srcAttr, (WebCore::QualifiedName*)&standbyAttr, (WebCore::QualifiedName*)&startAttr, @@ -672,7 +680,7 @@ WebCore::QualifiedName** getHTMLAttrs(size_t* size) (WebCore::QualifiedName*)&widthAttr, (WebCore::QualifiedName*)&wrapAttr, }; - *size = 198; + *size = 202; return HTMLAttr; } @@ -931,6 +939,7 @@ void init() const char *aria_valuemaxAttrString = "aria-valuemax"; const char *aria_valueminAttrString = "aria-valuemin"; const char *aria_valuenowAttrString = "aria-valuenow"; + const char *autobufferAttrString = "autobuffer"; const char *autocompleteAttrString = "autocomplete"; const char *autofocusAttrString = "autofocus"; const char *autoplayAttrString = "autoplay"; @@ -1047,6 +1056,8 @@ void init() const char *onmouseoverAttrString = "onmouseover"; const char *onmouseupAttrString = "onmouseup"; const char *onmousewheelAttrString = "onmousewheel"; + const char *onofflineAttrString = "onoffline"; + const char *ononlineAttrString = "ononline"; const char *onpasteAttrString = "onpaste"; const char *onresetAttrString = "onreset"; const char *onresizeAttrString = "onresize"; @@ -1085,6 +1096,7 @@ void init() const char *shapeAttrString = "shape"; const char *sizeAttrString = "size"; const char *spanAttrString = "span"; + const char *spellcheckAttrString = "spellcheck"; const char *srcAttrString = "src"; const char *standbyAttrString = "standby"; const char *startAttrString = "start"; @@ -1128,6 +1140,7 @@ void init() new ((void*)&aria_valuemaxAttr) QualifiedName(nullAtom, aria_valuemaxAttrString, nullAtom); new ((void*)&aria_valueminAttr) QualifiedName(nullAtom, aria_valueminAttrString, nullAtom); new ((void*)&aria_valuenowAttr) QualifiedName(nullAtom, aria_valuenowAttrString, nullAtom); + new ((void*)&autobufferAttr) QualifiedName(nullAtom, autobufferAttrString, nullAtom); new ((void*)&autocompleteAttr) QualifiedName(nullAtom, autocompleteAttrString, nullAtom); new ((void*)&autofocusAttr) QualifiedName(nullAtom, autofocusAttrString, nullAtom); new ((void*)&autoplayAttr) QualifiedName(nullAtom, autoplayAttrString, nullAtom); @@ -1245,6 +1258,8 @@ void init() new ((void*)&onmouseoverAttr) QualifiedName(nullAtom, onmouseoverAttrString, nullAtom); new ((void*)&onmouseupAttr) QualifiedName(nullAtom, onmouseupAttrString, nullAtom); new ((void*)&onmousewheelAttr) QualifiedName(nullAtom, onmousewheelAttrString, nullAtom); + new ((void*)&onofflineAttr) QualifiedName(nullAtom, onofflineAttrString, nullAtom); + new ((void*)&ononlineAttr) QualifiedName(nullAtom, ononlineAttrString, nullAtom); new ((void*)&onpasteAttr) QualifiedName(nullAtom, onpasteAttrString, nullAtom); new ((void*)&onresetAttr) QualifiedName(nullAtom, onresetAttrString, nullAtom); new ((void*)&onresizeAttr) QualifiedName(nullAtom, onresizeAttrString, nullAtom); @@ -1283,6 +1298,7 @@ void init() new ((void*)&shapeAttr) QualifiedName(nullAtom, shapeAttrString, nullAtom); new ((void*)&sizeAttr) QualifiedName(nullAtom, sizeAttrString, nullAtom); new ((void*)&spanAttr) QualifiedName(nullAtom, spanAttrString, nullAtom); + new ((void*)&spellcheckAttr) QualifiedName(nullAtom, spellcheckAttrString, nullAtom); new ((void*)&srcAttr) QualifiedName(nullAtom, srcAttrString, nullAtom); new ((void*)&standbyAttr) QualifiedName(nullAtom, standbyAttrString, nullAtom); new ((void*)&startAttr) QualifiedName(nullAtom, startAttrString, nullAtom); diff --git a/src/3rdparty/webkit/WebCore/generated/HTMLNames.h b/src/3rdparty/webkit/WebCore/generated/HTMLNames.h index 507a0a5367..939c8ec144 100644 --- a/src/3rdparty/webkit/WebCore/generated/HTMLNames.h +++ b/src/3rdparty/webkit/WebCore/generated/HTMLNames.h @@ -148,9 +148,6 @@ extern const WebCore::QualifiedName varTag; extern const WebCore::QualifiedName videoTag; extern const WebCore::QualifiedName wbrTag; extern const WebCore::QualifiedName xmpTag; - - -WebCore::QualifiedName** getHTMLTags(size_t* size); // Attributes extern const WebCore::QualifiedName abbrAttr; extern const WebCore::QualifiedName acceptAttr; @@ -171,6 +168,7 @@ extern const WebCore::QualifiedName aria_pressedAttr; extern const WebCore::QualifiedName aria_valuemaxAttr; extern const WebCore::QualifiedName aria_valueminAttr; extern const WebCore::QualifiedName aria_valuenowAttr; +extern const WebCore::QualifiedName autobufferAttr; extern const WebCore::QualifiedName autocompleteAttr; extern const WebCore::QualifiedName autofocusAttr; extern const WebCore::QualifiedName autoplayAttr; @@ -289,6 +287,8 @@ extern const WebCore::QualifiedName onmouseoutAttr; extern const WebCore::QualifiedName onmouseoverAttr; extern const WebCore::QualifiedName onmouseupAttr; extern const WebCore::QualifiedName onmousewheelAttr; +extern const WebCore::QualifiedName onofflineAttr; +extern const WebCore::QualifiedName ononlineAttr; extern const WebCore::QualifiedName onpasteAttr; extern const WebCore::QualifiedName onresetAttr; extern const WebCore::QualifiedName onresizeAttr; @@ -327,6 +327,7 @@ extern const WebCore::QualifiedName selectedAttr; extern const WebCore::QualifiedName shapeAttr; extern const WebCore::QualifiedName sizeAttr; extern const WebCore::QualifiedName spanAttr; +extern const WebCore::QualifiedName spellcheckAttr; extern const WebCore::QualifiedName srcAttr; extern const WebCore::QualifiedName standbyAttr; extern const WebCore::QualifiedName startAttr; @@ -351,11 +352,11 @@ extern const WebCore::QualifiedName vlinkAttr; extern const WebCore::QualifiedName vspaceAttr; extern const WebCore::QualifiedName widthAttr; extern const WebCore::QualifiedName wrapAttr; - - -WebCore::QualifiedName** getHTMLAttr(size_t* size); #endif +WebCore::QualifiedName** getHTMLTags(size_t* size); +WebCore::QualifiedName** getHTMLAttrs(size_t* size); + void init(); } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSAttr.cpp b/src/3rdparty/webkit/WebCore/generated/JSAttr.cpp index f7b7de3570..00b9a5feda 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSAttr.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSAttr.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSAttr) +ASSERT_CLASS_FITS_IN_CELL(JSAttr); /* Hash table */ @@ -79,13 +79,13 @@ public: JSAttrConstructor(ExecState* exec) : DOMObject(JSAttrConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSAttrPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSAttrPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -114,21 +114,21 @@ static const HashTable JSAttrPrototypeTable = const ClassInfo JSAttrPrototype::s_info = { "AttrPrototype", 0, &JSAttrPrototypeTable, 0 }; -JSObject* JSAttrPrototype::self(ExecState* exec) +JSObject* JSAttrPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSAttr>(exec); + return getDOMPrototype<JSAttr>(exec, globalObject); } -const ClassInfo JSAttr::s_info = { "Attr", &JSEventTargetNode::s_info, &JSAttrTable, 0 }; +const ClassInfo JSAttr::s_info = { "Attr", &JSNode::s_info, &JSAttrTable, 0 }; JSAttr::JSAttr(PassRefPtr<Structure> structure, PassRefPtr<Attr> impl) - : JSEventTargetNode(structure, impl) + : JSNode(structure, impl) { } -JSObject* JSAttr::createPrototype(ExecState* exec) +JSObject* JSAttr::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSAttrPrototype(JSAttrPrototype::createStructure(JSEventTargetNodePrototype::self(exec))); + return new (exec) JSAttrPrototype(JSAttrPrototype::createStructure(JSNodePrototype::self(exec, globalObject))); } bool JSAttr::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -136,58 +136,63 @@ bool JSAttr::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, return getStaticValueSlot<JSAttr, Base>(exec, &JSAttrTable, this, propertyName, slot); } -JSValuePtr jsAttrName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsAttrName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Attr* imp = static_cast<Attr*>(static_cast<JSAttr*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->name()); } -JSValuePtr jsAttrSpecified(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsAttrSpecified(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Attr* imp = static_cast<Attr*>(static_cast<JSAttr*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->specified()); } -JSValuePtr jsAttrValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsAttrValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Attr* imp = static_cast<Attr*>(static_cast<JSAttr*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->value()); } -JSValuePtr jsAttrOwnerElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsAttrOwnerElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Attr* imp = static_cast<Attr*>(static_cast<JSAttr*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->ownerElement())); } -JSValuePtr jsAttrStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsAttrStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Attr* imp = static_cast<Attr*>(static_cast<JSAttr*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsAttrConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsAttrConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSAttr*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSAttr::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSAttr::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSAttr, Base>(exec, propertyName, value, &JSAttrTable, this, slot); } -void setJSAttrValue(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSAttrValue(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSAttr*>(thisObject)->setValue(exec, value); } -JSValuePtr JSAttr::getConstructor(ExecState* exec) +JSValue JSAttr::getConstructor(ExecState* exec) { return getDOMConstructor<JSAttrConstructor>(exec); } -Attr* toAttr(JSC::JSValuePtr value) +Attr* toAttr(JSC::JSValue value) { - return value->isObject(&JSAttr::s_info) ? static_cast<JSAttr*>(asObject(value))->impl() : 0; + return value.isObject(&JSAttr::s_info) ? static_cast<JSAttr*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSAttr.h b/src/3rdparty/webkit/WebCore/generated/JSAttr.h index 40b861e168..37f0193a48 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSAttr.h +++ b/src/3rdparty/webkit/WebCore/generated/JSAttr.h @@ -21,42 +21,43 @@ #ifndef JSAttr_h #define JSAttr_h -#include "JSEventTargetNode.h" +#include "JSNode.h" #include "Attr.h" namespace WebCore { class Attr; -class JSAttr : public JSEventTargetNode { - typedef JSEventTargetNode Base; +class JSAttr : public JSNode { + typedef JSNode Base; public: JSAttr(PassRefPtr<JSC::Structure>, PassRefPtr<Attr>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom attributes - void setValue(JSC::ExecState*, JSC::JSValuePtr); + void setValue(JSC::ExecState*, JSC::JSValue); Attr* impl() const { return static_cast<Attr*>(Base::impl()); } }; -Attr* toAttr(JSC::JSValuePtr); +Attr* toAttr(JSC::JSValue); class JSAttrPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSAttrPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -64,13 +65,13 @@ public: // Attributes -JSC::JSValuePtr jsAttrName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsAttrSpecified(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsAttrValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSAttrValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsAttrOwnerElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsAttrStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsAttrConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsAttrName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsAttrSpecified(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsAttrValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSAttrValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsAttrOwnerElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsAttrStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsAttrConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSBarInfo.cpp b/src/3rdparty/webkit/WebCore/generated/JSBarInfo.cpp index 566468fb22..89860d2d13 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSBarInfo.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSBarInfo.cpp @@ -31,7 +31,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSBarInfo) +ASSERT_CLASS_FITS_IN_CELL(JSBarInfo); /* Hash table */ @@ -64,9 +64,9 @@ static const HashTable JSBarInfoPrototypeTable = const ClassInfo JSBarInfoPrototype::s_info = { "BarInfoPrototype", 0, &JSBarInfoPrototypeTable, 0 }; -JSObject* JSBarInfoPrototype::self(ExecState* exec) +JSObject* JSBarInfoPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSBarInfo>(exec); + return getDOMPrototype<JSBarInfo>(exec, globalObject); } const ClassInfo JSBarInfo::s_info = { "BarInfo", 0, &JSBarInfoTable, 0 }; @@ -80,12 +80,11 @@ JSBarInfo::JSBarInfo(PassRefPtr<Structure> structure, PassRefPtr<BarInfo> impl) JSBarInfo::~JSBarInfo() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSBarInfo::createPrototype(ExecState* exec) +JSObject* JSBarInfo::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSBarInfoPrototype(JSBarInfoPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSBarInfoPrototype(JSBarInfoPrototype::createStructure(globalObject->objectPrototype())); } bool JSBarInfo::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -93,19 +92,20 @@ bool JSBarInfo::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa return getStaticValueSlot<JSBarInfo, Base>(exec, &JSBarInfoTable, this, propertyName, slot); } -JSValuePtr jsBarInfoVisible(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsBarInfoVisible(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); BarInfo* imp = static_cast<BarInfo*>(static_cast<JSBarInfo*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->visible()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, BarInfo* object) +JSC::JSValue toJS(JSC::ExecState* exec, BarInfo* object) { return getDOMObjectWrapper<JSBarInfo>(exec, object); } -BarInfo* toBarInfo(JSC::JSValuePtr value) +BarInfo* toBarInfo(JSC::JSValue value) { - return value->isObject(&JSBarInfo::s_info) ? static_cast<JSBarInfo*>(asObject(value))->impl() : 0; + return value.isObject(&JSBarInfo::s_info) ? static_cast<JSBarInfo*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSBarInfo.h b/src/3rdparty/webkit/WebCore/generated/JSBarInfo.h index f13a62ce88..c27d6c1994 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSBarInfo.h +++ b/src/3rdparty/webkit/WebCore/generated/JSBarInfo.h @@ -34,12 +34,12 @@ class JSBarInfo : public DOMObject { public: JSBarInfo(PassRefPtr<JSC::Structure>, PassRefPtr<BarInfo>); virtual ~JSBarInfo(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -50,12 +50,13 @@ private: RefPtr<BarInfo> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, BarInfo*); -BarInfo* toBarInfo(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, BarInfo*); +BarInfo* toBarInfo(JSC::JSValue); class JSBarInfoPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSBarInfoPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -63,7 +64,7 @@ public: // Attributes -JSC::JSValuePtr jsBarInfoVisible(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsBarInfoVisible(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCDATASection.cpp b/src/3rdparty/webkit/WebCore/generated/JSCDATASection.cpp index 0374edd6ad..169940146f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCDATASection.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCDATASection.cpp @@ -32,7 +32,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCDATASection) +ASSERT_CLASS_FITS_IN_CELL(JSCDATASection); /* Hash table */ @@ -68,13 +68,13 @@ public: JSCDATASectionConstructor(ExecState* exec) : DOMObject(JSCDATASectionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCDATASectionPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCDATASectionPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -103,9 +103,9 @@ static const HashTable JSCDATASectionPrototypeTable = const ClassInfo JSCDATASectionPrototype::s_info = { "CDATASectionPrototype", 0, &JSCDATASectionPrototypeTable, 0 }; -JSObject* JSCDATASectionPrototype::self(ExecState* exec) +JSObject* JSCDATASectionPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCDATASection>(exec); + return getDOMPrototype<JSCDATASection>(exec, globalObject); } const ClassInfo JSCDATASection::s_info = { "CDATASection", &JSText::s_info, &JSCDATASectionTable, 0 }; @@ -115,9 +115,9 @@ JSCDATASection::JSCDATASection(PassRefPtr<Structure> structure, PassRefPtr<CDATA { } -JSObject* JSCDATASection::createPrototype(ExecState* exec) +JSObject* JSCDATASection::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCDATASectionPrototype(JSCDATASectionPrototype::createStructure(JSTextPrototype::self(exec))); + return new (exec) JSCDATASectionPrototype(JSCDATASectionPrototype::createStructure(JSTextPrototype::self(exec, globalObject))); } bool JSCDATASection::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -125,11 +125,11 @@ bool JSCDATASection::getOwnPropertySlot(ExecState* exec, const Identifier& prope return getStaticValueSlot<JSCDATASection, Base>(exec, &JSCDATASectionTable, this, propertyName, slot); } -JSValuePtr jsCDATASectionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCDATASectionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCDATASection*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSCDATASection::getConstructor(ExecState* exec) +JSValue JSCDATASection::getConstructor(ExecState* exec) { return getDOMConstructor<JSCDATASectionConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCDATASection.h b/src/3rdparty/webkit/WebCore/generated/JSCDATASection.h index b92e3ac6b6..724ca0be22 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCDATASection.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCDATASection.h @@ -31,23 +31,25 @@ class JSCDATASection : public JSText { typedef JSText Base; public: JSCDATASection(PassRefPtr<JSC::Structure>, PassRefPtr<CDATASection>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; +JSC::JSValue toJSNewlyCreated(JSC::ExecState*, CDATASection*); class JSCDATASectionPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSCDATASectionPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -55,7 +57,7 @@ public: // Attributes -JSC::JSValuePtr jsCDATASectionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCDATASectionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSCharsetRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSCharsetRule.cpp index 8dfe3c31dc..9015d1e08b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSCharsetRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSCharsetRule.cpp @@ -33,7 +33,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCSSCharsetRule) +ASSERT_CLASS_FITS_IN_CELL(JSCSSCharsetRule); /* Hash table */ @@ -70,13 +70,13 @@ public: JSCSSCharsetRuleConstructor(ExecState* exec) : DOMObject(JSCSSCharsetRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCSSCharsetRulePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCSSCharsetRulePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -105,9 +105,9 @@ static const HashTable JSCSSCharsetRulePrototypeTable = const ClassInfo JSCSSCharsetRulePrototype::s_info = { "CSSCharsetRulePrototype", 0, &JSCSSCharsetRulePrototypeTable, 0 }; -JSObject* JSCSSCharsetRulePrototype::self(ExecState* exec) +JSObject* JSCSSCharsetRulePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCSSCharsetRule>(exec); + return getDOMPrototype<JSCSSCharsetRule>(exec, globalObject); } const ClassInfo JSCSSCharsetRule::s_info = { "CSSCharsetRule", &JSCSSRule::s_info, &JSCSSCharsetRuleTable, 0 }; @@ -117,9 +117,9 @@ JSCSSCharsetRule::JSCSSCharsetRule(PassRefPtr<Structure> structure, PassRefPtr<C { } -JSObject* JSCSSCharsetRule::createPrototype(ExecState* exec) +JSObject* JSCSSCharsetRule::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCSSCharsetRulePrototype(JSCSSCharsetRulePrototype::createStructure(JSCSSRulePrototype::self(exec))); + return new (exec) JSCSSCharsetRulePrototype(JSCSSCharsetRulePrototype::createStructure(JSCSSRulePrototype::self(exec, globalObject))); } bool JSCSSCharsetRule::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -127,22 +127,23 @@ bool JSCSSCharsetRule::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSCSSCharsetRule, Base>(exec, &JSCSSCharsetRuleTable, this, propertyName, slot); } -JSValuePtr jsCSSCharsetRuleEncoding(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSCharsetRuleEncoding(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSCharsetRule* imp = static_cast<CSSCharsetRule*>(static_cast<JSCSSCharsetRule*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->encoding()); } -JSValuePtr jsCSSCharsetRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSCharsetRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCSSCharsetRule*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSCSSCharsetRule::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSCSSCharsetRule::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSCSSCharsetRule, Base>(exec, propertyName, value, &JSCSSCharsetRuleTable, this, slot); } -void setJSCSSCharsetRuleEncoding(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCSSCharsetRuleEncoding(ExecState* exec, JSObject* thisObject, JSValue value) { CSSCharsetRule* imp = static_cast<CSSCharsetRule*>(static_cast<JSCSSCharsetRule*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -150,7 +151,7 @@ void setJSCSSCharsetRuleEncoding(ExecState* exec, JSObject* thisObject, JSValueP setDOMException(exec, ec); } -JSValuePtr JSCSSCharsetRule::getConstructor(ExecState* exec) +JSValue JSCSSCharsetRule::getConstructor(ExecState* exec) { return getDOMConstructor<JSCSSCharsetRuleConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSCharsetRule.h b/src/3rdparty/webkit/WebCore/generated/JSCSSCharsetRule.h index 9877f1a97b..54c3be3cce 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSCharsetRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSCharsetRule.h @@ -31,24 +31,25 @@ class JSCSSCharsetRule : public JSCSSRule { typedef JSCSSRule Base; public: JSCSSCharsetRule(PassRefPtr<JSC::Structure>, PassRefPtr<CSSCharsetRule>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSCSSCharsetRulePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSCSSCharsetRulePrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,9 +57,9 @@ public: // Attributes -JSC::JSValuePtr jsCSSCharsetRuleEncoding(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCSSCharsetRuleEncoding(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCSSCharsetRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSCharsetRuleEncoding(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCSSCharsetRuleEncoding(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCSSCharsetRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSFontFaceRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSFontFaceRule.cpp index 4109ea8174..1490ac6ab6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSFontFaceRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSFontFaceRule.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCSSFontFaceRule) +ASSERT_CLASS_FITS_IN_CELL(JSCSSFontFaceRule); /* Hash table */ @@ -72,13 +72,13 @@ public: JSCSSFontFaceRuleConstructor(ExecState* exec) : DOMObject(JSCSSFontFaceRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCSSFontFaceRulePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCSSFontFaceRulePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -107,9 +107,9 @@ static const HashTable JSCSSFontFaceRulePrototypeTable = const ClassInfo JSCSSFontFaceRulePrototype::s_info = { "CSSFontFaceRulePrototype", 0, &JSCSSFontFaceRulePrototypeTable, 0 }; -JSObject* JSCSSFontFaceRulePrototype::self(ExecState* exec) +JSObject* JSCSSFontFaceRulePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCSSFontFaceRule>(exec); + return getDOMPrototype<JSCSSFontFaceRule>(exec, globalObject); } const ClassInfo JSCSSFontFaceRule::s_info = { "CSSFontFaceRule", &JSCSSRule::s_info, &JSCSSFontFaceRuleTable, 0 }; @@ -119,9 +119,9 @@ JSCSSFontFaceRule::JSCSSFontFaceRule(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSCSSFontFaceRule::createPrototype(ExecState* exec) +JSObject* JSCSSFontFaceRule::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCSSFontFaceRulePrototype(JSCSSFontFaceRulePrototype::createStructure(JSCSSRulePrototype::self(exec))); + return new (exec) JSCSSFontFaceRulePrototype(JSCSSFontFaceRulePrototype::createStructure(JSCSSRulePrototype::self(exec, globalObject))); } bool JSCSSFontFaceRule::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -129,17 +129,18 @@ bool JSCSSFontFaceRule::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSCSSFontFaceRule, Base>(exec, &JSCSSFontFaceRuleTable, this, propertyName, slot); } -JSValuePtr jsCSSFontFaceRuleStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSFontFaceRuleStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSFontFaceRule* imp = static_cast<CSSFontFaceRule*>(static_cast<JSCSSFontFaceRule*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsCSSFontFaceRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSFontFaceRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCSSFontFaceRule*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSCSSFontFaceRule::getConstructor(ExecState* exec) +JSValue JSCSSFontFaceRule::getConstructor(ExecState* exec) { return getDOMConstructor<JSCSSFontFaceRuleConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSFontFaceRule.h b/src/3rdparty/webkit/WebCore/generated/JSCSSFontFaceRule.h index 15677186f2..a2acf4cfbf 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSFontFaceRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSFontFaceRule.h @@ -31,23 +31,24 @@ class JSCSSFontFaceRule : public JSCSSRule { typedef JSCSSRule Base; public: JSCSSFontFaceRule(PassRefPtr<JSC::Structure>, PassRefPtr<CSSFontFaceRule>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSCSSFontFaceRulePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSCSSFontFaceRulePrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -55,8 +56,8 @@ public: // Attributes -JSC::JSValuePtr jsCSSFontFaceRuleStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSFontFaceRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSFontFaceRuleStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSFontFaceRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSImportRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSImportRule.cpp index bc2dad51a6..412dac1fbc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSImportRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSImportRule.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCSSImportRule) +ASSERT_CLASS_FITS_IN_CELL(JSCSSImportRule); /* Hash table */ @@ -76,13 +76,13 @@ public: JSCSSImportRuleConstructor(ExecState* exec) : DOMObject(JSCSSImportRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCSSImportRulePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCSSImportRulePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -111,9 +111,9 @@ static const HashTable JSCSSImportRulePrototypeTable = const ClassInfo JSCSSImportRulePrototype::s_info = { "CSSImportRulePrototype", 0, &JSCSSImportRulePrototypeTable, 0 }; -JSObject* JSCSSImportRulePrototype::self(ExecState* exec) +JSObject* JSCSSImportRulePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCSSImportRule>(exec); + return getDOMPrototype<JSCSSImportRule>(exec, globalObject); } const ClassInfo JSCSSImportRule::s_info = { "CSSImportRule", &JSCSSRule::s_info, &JSCSSImportRuleTable, 0 }; @@ -123,9 +123,9 @@ JSCSSImportRule::JSCSSImportRule(PassRefPtr<Structure> structure, PassRefPtr<CSS { } -JSObject* JSCSSImportRule::createPrototype(ExecState* exec) +JSObject* JSCSSImportRule::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCSSImportRulePrototype(JSCSSImportRulePrototype::createStructure(JSCSSRulePrototype::self(exec))); + return new (exec) JSCSSImportRulePrototype(JSCSSImportRulePrototype::createStructure(JSCSSRulePrototype::self(exec, globalObject))); } bool JSCSSImportRule::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -133,29 +133,32 @@ bool JSCSSImportRule::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSCSSImportRule, Base>(exec, &JSCSSImportRuleTable, this, propertyName, slot); } -JSValuePtr jsCSSImportRuleHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSImportRuleHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSImportRule* imp = static_cast<CSSImportRule*>(static_cast<JSCSSImportRule*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->href()); } -JSValuePtr jsCSSImportRuleMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSImportRuleMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSImportRule* imp = static_cast<CSSImportRule*>(static_cast<JSCSSImportRule*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->media())); } -JSValuePtr jsCSSImportRuleStyleSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSImportRuleStyleSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSImportRule* imp = static_cast<CSSImportRule*>(static_cast<JSCSSImportRule*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->styleSheet())); } -JSValuePtr jsCSSImportRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSImportRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCSSImportRule*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSCSSImportRule::getConstructor(ExecState* exec) +JSValue JSCSSImportRule::getConstructor(ExecState* exec) { return getDOMConstructor<JSCSSImportRuleConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSImportRule.h b/src/3rdparty/webkit/WebCore/generated/JSCSSImportRule.h index 19ed0d7ef0..14bae40223 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSImportRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSImportRule.h @@ -31,23 +31,24 @@ class JSCSSImportRule : public JSCSSRule { typedef JSCSSRule Base; public: JSCSSImportRule(PassRefPtr<JSC::Structure>, PassRefPtr<CSSImportRule>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSCSSImportRulePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSCSSImportRulePrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -55,10 +56,10 @@ public: // Attributes -JSC::JSValuePtr jsCSSImportRuleHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSImportRuleMedia(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSImportRuleStyleSheet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSImportRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSImportRuleHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSImportRuleMedia(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSImportRuleStyleSheet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSImportRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSMediaRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSMediaRule.cpp index 727157df62..c8f3e09e30 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSMediaRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSMediaRule.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCSSMediaRule) +ASSERT_CLASS_FITS_IN_CELL(JSCSSMediaRule); /* Hash table */ @@ -75,13 +75,13 @@ public: JSCSSMediaRuleConstructor(ExecState* exec) : DOMObject(JSCSSMediaRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCSSMediaRulePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCSSMediaRulePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -112,9 +112,9 @@ static const HashTable JSCSSMediaRulePrototypeTable = const ClassInfo JSCSSMediaRulePrototype::s_info = { "CSSMediaRulePrototype", 0, &JSCSSMediaRulePrototypeTable, 0 }; -JSObject* JSCSSMediaRulePrototype::self(ExecState* exec) +JSObject* JSCSSMediaRulePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCSSMediaRule>(exec); + return getDOMPrototype<JSCSSMediaRule>(exec, globalObject); } bool JSCSSMediaRulePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -129,9 +129,9 @@ JSCSSMediaRule::JSCSSMediaRule(PassRefPtr<Structure> structure, PassRefPtr<CSSMe { } -JSObject* JSCSSMediaRule::createPrototype(ExecState* exec) +JSObject* JSCSSMediaRule::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCSSMediaRulePrototype(JSCSSMediaRulePrototype::createStructure(JSCSSRulePrototype::self(exec))); + return new (exec) JSCSSMediaRulePrototype(JSCSSMediaRulePrototype::createStructure(JSCSSRulePrototype::self(exec, globalObject))); } bool JSCSSMediaRule::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -139,51 +139,55 @@ bool JSCSSMediaRule::getOwnPropertySlot(ExecState* exec, const Identifier& prope return getStaticValueSlot<JSCSSMediaRule, Base>(exec, &JSCSSMediaRuleTable, this, propertyName, slot); } -JSValuePtr jsCSSMediaRuleMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSMediaRuleMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSMediaRule* imp = static_cast<CSSMediaRule*>(static_cast<JSCSSMediaRule*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->media())); } -JSValuePtr jsCSSMediaRuleCssRules(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSMediaRuleCssRules(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSMediaRule* imp = static_cast<CSSMediaRule*>(static_cast<JSCSSMediaRule*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->cssRules())); } -JSValuePtr jsCSSMediaRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSMediaRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCSSMediaRule*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSCSSMediaRule::getConstructor(ExecState* exec) +JSValue JSCSSMediaRule::getConstructor(ExecState* exec) { return getDOMConstructor<JSCSSMediaRuleConstructor>(exec); } -JSValuePtr jsCSSMediaRulePrototypeFunctionInsertRule(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSMediaRulePrototypeFunctionInsertRule(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSMediaRule::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSMediaRule::s_info)) return throwError(exec, TypeError); JSCSSMediaRule* castedThisObj = static_cast<JSCSSMediaRule*>(asObject(thisValue)); CSSMediaRule* imp = static_cast<CSSMediaRule*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& rule = args.at(exec, 0)->toString(exec); - unsigned index = args.at(exec, 1)->toInt32(exec); + const UString& rule = args.at(0).toString(exec); + unsigned index = args.at(1).toInt32(exec); - JSC::JSValuePtr result = jsNumber(exec, imp->insertRule(rule, index, ec)); + JSC::JSValue result = jsNumber(exec, imp->insertRule(rule, index, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsCSSMediaRulePrototypeFunctionDeleteRule(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSMediaRulePrototypeFunctionDeleteRule(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSMediaRule::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSMediaRule::s_info)) return throwError(exec, TypeError); JSCSSMediaRule* castedThisObj = static_cast<JSCSSMediaRule*>(asObject(thisValue)); CSSMediaRule* imp = static_cast<CSSMediaRule*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); imp->deleteRule(index, ec); setDOMException(exec, ec); diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSMediaRule.h b/src/3rdparty/webkit/WebCore/generated/JSCSSMediaRule.h index 79a9332d4f..bccda5d6c3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSMediaRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSMediaRule.h @@ -31,27 +31,28 @@ class JSCSSMediaRule : public JSCSSRule { typedef JSCSSRule Base; public: JSCSSMediaRule(PassRefPtr<JSC::Structure>, PassRefPtr<CSSMediaRule>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSCSSMediaRulePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,13 +61,13 @@ public: // Functions -JSC::JSValuePtr jsCSSMediaRulePrototypeFunctionInsertRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSMediaRulePrototypeFunctionDeleteRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSMediaRulePrototypeFunctionInsertRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSMediaRulePrototypeFunctionDeleteRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsCSSMediaRuleMedia(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSMediaRuleCssRules(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSMediaRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSMediaRuleMedia(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSMediaRuleCssRules(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSMediaRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSPageRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSPageRule.cpp index 588dc5eb95..f5428c3c7d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSPageRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSPageRule.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCSSPageRule) +ASSERT_CLASS_FITS_IN_CELL(JSCSSPageRule); /* Hash table */ @@ -74,13 +74,13 @@ public: JSCSSPageRuleConstructor(ExecState* exec) : DOMObject(JSCSSPageRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCSSPageRulePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCSSPageRulePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -109,9 +109,9 @@ static const HashTable JSCSSPageRulePrototypeTable = const ClassInfo JSCSSPageRulePrototype::s_info = { "CSSPageRulePrototype", 0, &JSCSSPageRulePrototypeTable, 0 }; -JSObject* JSCSSPageRulePrototype::self(ExecState* exec) +JSObject* JSCSSPageRulePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCSSPageRule>(exec); + return getDOMPrototype<JSCSSPageRule>(exec, globalObject); } const ClassInfo JSCSSPageRule::s_info = { "CSSPageRule", &JSCSSRule::s_info, &JSCSSPageRuleTable, 0 }; @@ -121,9 +121,9 @@ JSCSSPageRule::JSCSSPageRule(PassRefPtr<Structure> structure, PassRefPtr<CSSPage { } -JSObject* JSCSSPageRule::createPrototype(ExecState* exec) +JSObject* JSCSSPageRule::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCSSPageRulePrototype(JSCSSPageRulePrototype::createStructure(JSCSSRulePrototype::self(exec))); + return new (exec) JSCSSPageRulePrototype(JSCSSPageRulePrototype::createStructure(JSCSSRulePrototype::self(exec, globalObject))); } bool JSCSSPageRule::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -131,28 +131,30 @@ bool JSCSSPageRule::getOwnPropertySlot(ExecState* exec, const Identifier& proper return getStaticValueSlot<JSCSSPageRule, Base>(exec, &JSCSSPageRuleTable, this, propertyName, slot); } -JSValuePtr jsCSSPageRuleSelectorText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSPageRuleSelectorText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSPageRule* imp = static_cast<CSSPageRule*>(static_cast<JSCSSPageRule*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->selectorText()); } -JSValuePtr jsCSSPageRuleStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSPageRuleStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSPageRule* imp = static_cast<CSSPageRule*>(static_cast<JSCSSPageRule*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsCSSPageRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSPageRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCSSPageRule*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSCSSPageRule::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSCSSPageRule::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSCSSPageRule, Base>(exec, propertyName, value, &JSCSSPageRuleTable, this, slot); } -void setJSCSSPageRuleSelectorText(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCSSPageRuleSelectorText(ExecState* exec, JSObject* thisObject, JSValue value) { CSSPageRule* imp = static_cast<CSSPageRule*>(static_cast<JSCSSPageRule*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -160,7 +162,7 @@ void setJSCSSPageRuleSelectorText(ExecState* exec, JSObject* thisObject, JSValue setDOMException(exec, ec); } -JSValuePtr JSCSSPageRule::getConstructor(ExecState* exec) +JSValue JSCSSPageRule::getConstructor(ExecState* exec) { return getDOMConstructor<JSCSSPageRuleConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSPageRule.h b/src/3rdparty/webkit/WebCore/generated/JSCSSPageRule.h index 1fda2dfe0d..a8159903ce 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSPageRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSPageRule.h @@ -31,24 +31,25 @@ class JSCSSPageRule : public JSCSSRule { typedef JSCSSRule Base; public: JSCSSPageRule(PassRefPtr<JSC::Structure>, PassRefPtr<CSSPageRule>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSCSSPageRulePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSCSSPageRulePrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,10 +57,10 @@ public: // Attributes -JSC::JSValuePtr jsCSSPageRuleSelectorText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCSSPageRuleSelectorText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCSSPageRuleStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPageRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPageRuleSelectorText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCSSPageRuleSelectorText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCSSPageRuleStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPageRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSPrimitiveValue.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSPrimitiveValue.cpp index 21012ee82b..bf64f1659a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSPrimitiveValue.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSPrimitiveValue.cpp @@ -40,7 +40,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCSSPrimitiveValue) +ASSERT_CLASS_FITS_IN_CELL(JSCSSPrimitiveValue); /* Hash table */ @@ -103,13 +103,13 @@ public: JSCSSPrimitiveValueConstructor(ExecState* exec) : DOMObject(JSCSSPrimitiveValueConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCSSPrimitiveValuePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCSSPrimitiveValuePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -171,9 +171,9 @@ static const HashTable JSCSSPrimitiveValuePrototypeTable = const ClassInfo JSCSSPrimitiveValuePrototype::s_info = { "CSSPrimitiveValuePrototype", 0, &JSCSSPrimitiveValuePrototypeTable, 0 }; -JSObject* JSCSSPrimitiveValuePrototype::self(ExecState* exec) +JSObject* JSCSSPrimitiveValuePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCSSPrimitiveValue>(exec); + return getDOMPrototype<JSCSSPrimitiveValue>(exec, globalObject); } bool JSCSSPrimitiveValuePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -188,9 +188,9 @@ JSCSSPrimitiveValue::JSCSSPrimitiveValue(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSCSSPrimitiveValue::createPrototype(ExecState* exec) +JSObject* JSCSSPrimitiveValue::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCSSPrimitiveValuePrototype(JSCSSPrimitiveValuePrototype::createStructure(JSCSSValuePrototype::self(exec))); + return new (exec) JSCSSPrimitiveValuePrototype(JSCSSPrimitiveValuePrototype::createStructure(JSCSSValuePrototype::self(exec, globalObject))); } bool JSCSSPrimitiveValue::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -198,250 +198,258 @@ bool JSCSSPrimitiveValue::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSCSSPrimitiveValue, Base>(exec, &JSCSSPrimitiveValueTable, this, propertyName, slot); } -JSValuePtr jsCSSPrimitiveValuePrimitiveType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSPrimitiveValuePrimitiveType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSPrimitiveValue* imp = static_cast<CSSPrimitiveValue*>(static_cast<JSCSSPrimitiveValue*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->primitiveType()); } -JSValuePtr jsCSSPrimitiveValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSPrimitiveValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCSSPrimitiveValue*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSCSSPrimitiveValue::getConstructor(ExecState* exec) +JSValue JSCSSPrimitiveValue::getConstructor(ExecState* exec) { return getDOMConstructor<JSCSSPrimitiveValueConstructor>(exec); } -JSValuePtr jsCSSPrimitiveValuePrototypeFunctionSetFloatValue(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionSetFloatValue(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSPrimitiveValue::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSPrimitiveValue::s_info)) return throwError(exec, TypeError); JSCSSPrimitiveValue* castedThisObj = static_cast<JSCSSPrimitiveValue*>(asObject(thisValue)); CSSPrimitiveValue* imp = static_cast<CSSPrimitiveValue*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned short unitType = args.at(exec, 0)->toInt32(exec); - float floatValue = args.at(exec, 1)->toFloat(exec); + unsigned short unitType = args.at(0).toInt32(exec); + float floatValue = args.at(1).toFloat(exec); imp->setFloatValue(unitType, floatValue, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsCSSPrimitiveValuePrototypeFunctionGetFloatValue(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionGetFloatValue(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSPrimitiveValue::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSPrimitiveValue::s_info)) return throwError(exec, TypeError); JSCSSPrimitiveValue* castedThisObj = static_cast<JSCSSPrimitiveValue*>(asObject(thisValue)); CSSPrimitiveValue* imp = static_cast<CSSPrimitiveValue*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned short unitType = args.at(exec, 0)->toInt32(exec); + unsigned short unitType = args.at(0).toInt32(exec); - JSC::JSValuePtr result = jsNumber(exec, imp->getFloatValue(unitType, ec)); + JSC::JSValue result = jsNumber(exec, imp->getFloatValue(unitType, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsCSSPrimitiveValuePrototypeFunctionSetStringValue(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionSetStringValue(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSPrimitiveValue::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSPrimitiveValue::s_info)) return throwError(exec, TypeError); JSCSSPrimitiveValue* castedThisObj = static_cast<JSCSSPrimitiveValue*>(asObject(thisValue)); CSSPrimitiveValue* imp = static_cast<CSSPrimitiveValue*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned short stringType = args.at(exec, 0)->toInt32(exec); - const UString& stringValue = args.at(exec, 1)->toString(exec); + unsigned short stringType = args.at(0).toInt32(exec); + const UString& stringValue = args.at(1).toString(exec); imp->setStringValue(stringType, stringValue, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsCSSPrimitiveValuePrototypeFunctionGetStringValue(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionGetStringValue(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSPrimitiveValue::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSPrimitiveValue::s_info)) return throwError(exec, TypeError); JSCSSPrimitiveValue* castedThisObj = static_cast<JSCSSPrimitiveValue*>(asObject(thisValue)); CSSPrimitiveValue* imp = static_cast<CSSPrimitiveValue*>(castedThisObj->impl()); ExceptionCode ec = 0; - JSC::JSValuePtr result = jsString(exec, imp->getStringValue(ec)); + JSC::JSValue result = jsString(exec, imp->getStringValue(ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsCSSPrimitiveValuePrototypeFunctionGetCounterValue(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionGetCounterValue(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSPrimitiveValue::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSPrimitiveValue::s_info)) return throwError(exec, TypeError); JSCSSPrimitiveValue* castedThisObj = static_cast<JSCSSPrimitiveValue*>(asObject(thisValue)); CSSPrimitiveValue* imp = static_cast<CSSPrimitiveValue*>(castedThisObj->impl()); ExceptionCode ec = 0; - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getCounterValue(ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getCounterValue(ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsCSSPrimitiveValuePrototypeFunctionGetRectValue(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionGetRectValue(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSPrimitiveValue::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSPrimitiveValue::s_info)) return throwError(exec, TypeError); JSCSSPrimitiveValue* castedThisObj = static_cast<JSCSSPrimitiveValue*>(asObject(thisValue)); CSSPrimitiveValue* imp = static_cast<CSSPrimitiveValue*>(castedThisObj->impl()); ExceptionCode ec = 0; - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getRectValue(ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getRectValue(ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsCSSPrimitiveValuePrototypeFunctionGetRGBColorValue(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionGetRGBColorValue(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSPrimitiveValue::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSPrimitiveValue::s_info)) return throwError(exec, TypeError); JSCSSPrimitiveValue* castedThisObj = static_cast<JSCSSPrimitiveValue*>(asObject(thisValue)); CSSPrimitiveValue* imp = static_cast<CSSPrimitiveValue*>(castedThisObj->impl()); ExceptionCode ec = 0; - JSC::JSValuePtr result = getJSRGBColor(exec, imp->getRGBColorValue(ec)); + JSC::JSValue result = getJSRGBColor(exec, imp->getRGBColorValue(ec)); setDOMException(exec, ec); return result; } // Constant getters -JSValuePtr jsCSSPrimitiveValueCSS_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsCSSPrimitiveValueCSS_NUMBER(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_NUMBER(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsCSSPrimitiveValueCSS_PERCENTAGE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_PERCENTAGE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsCSSPrimitiveValueCSS_EMS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_EMS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsCSSPrimitiveValueCSS_EXS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_EXS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSValuePtr jsCSSPrimitiveValueCSS_PX(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_PX(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(5)); } -JSValuePtr jsCSSPrimitiveValueCSS_CM(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_CM(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(6)); } -JSValuePtr jsCSSPrimitiveValueCSS_MM(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_MM(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(7)); } -JSValuePtr jsCSSPrimitiveValueCSS_IN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_IN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(8)); } -JSValuePtr jsCSSPrimitiveValueCSS_PT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_PT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(9)); } -JSValuePtr jsCSSPrimitiveValueCSS_PC(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_PC(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(10)); } -JSValuePtr jsCSSPrimitiveValueCSS_DEG(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_DEG(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(11)); } -JSValuePtr jsCSSPrimitiveValueCSS_RAD(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_RAD(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(12)); } -JSValuePtr jsCSSPrimitiveValueCSS_GRAD(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_GRAD(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(13)); } -JSValuePtr jsCSSPrimitiveValueCSS_MS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_MS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(14)); } -JSValuePtr jsCSSPrimitiveValueCSS_S(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_S(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(15)); } -JSValuePtr jsCSSPrimitiveValueCSS_HZ(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_HZ(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(16)); } -JSValuePtr jsCSSPrimitiveValueCSS_KHZ(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_KHZ(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(17)); } -JSValuePtr jsCSSPrimitiveValueCSS_DIMENSION(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_DIMENSION(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(18)); } -JSValuePtr jsCSSPrimitiveValueCSS_STRING(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_STRING(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(19)); } -JSValuePtr jsCSSPrimitiveValueCSS_URI(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_URI(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(20)); } -JSValuePtr jsCSSPrimitiveValueCSS_IDENT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_IDENT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(21)); } -JSValuePtr jsCSSPrimitiveValueCSS_ATTR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_ATTR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(22)); } -JSValuePtr jsCSSPrimitiveValueCSS_COUNTER(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_COUNTER(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(23)); } -JSValuePtr jsCSSPrimitiveValueCSS_RECT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_RECT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(24)); } -JSValuePtr jsCSSPrimitiveValueCSS_RGBCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSPrimitiveValueCSS_RGBCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(25)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSPrimitiveValue.h b/src/3rdparty/webkit/WebCore/generated/JSCSSPrimitiveValue.h index 94c46f246b..39416aabc3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSPrimitiveValue.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSPrimitiveValue.h @@ -31,27 +31,28 @@ class JSCSSPrimitiveValue : public JSCSSValue { typedef JSCSSValue Base; public: JSCSSPrimitiveValue(PassRefPtr<JSC::Structure>, PassRefPtr<CSSPrimitiveValue>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSCSSPrimitiveValuePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,45 +61,45 @@ public: // Functions -JSC::JSValuePtr jsCSSPrimitiveValuePrototypeFunctionSetFloatValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSPrimitiveValuePrototypeFunctionGetFloatValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSPrimitiveValuePrototypeFunctionSetStringValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSPrimitiveValuePrototypeFunctionGetStringValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSPrimitiveValuePrototypeFunctionGetCounterValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSPrimitiveValuePrototypeFunctionGetRectValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSPrimitiveValuePrototypeFunctionGetRGBColorValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionSetFloatValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionGetFloatValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionSetStringValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionGetStringValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionGetCounterValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionGetRectValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionGetRGBColorValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsCSSPrimitiveValuePrimitiveType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValuePrimitiveType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsCSSPrimitiveValueCSS_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_NUMBER(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_PERCENTAGE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_EMS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_EXS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_PX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_CM(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_MM(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_IN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_PT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_PC(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_DEG(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_RAD(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_GRAD(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_MS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_S(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_HZ(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_KHZ(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_DIMENSION(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_STRING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_URI(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_IDENT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_ATTR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_COUNTER(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_RECT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSPrimitiveValueCSS_RGBCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_NUMBER(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_PERCENTAGE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_EMS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_EXS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_PX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_CM(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_MM(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_IN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_PT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_PC(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_DEG(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_RAD(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_GRAD(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_MS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_S(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_HZ(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_KHZ(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_DIMENSION(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_STRING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_URI(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_IDENT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_ATTR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_COUNTER(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_RECT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSPrimitiveValueCSS_RGBCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSRule.cpp index 3dc2b55370..47bb5ccda8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSRule.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCSSRule) +ASSERT_CLASS_FITS_IN_CELL(JSCSSRule); /* Hash table */ @@ -86,13 +86,13 @@ public: JSCSSRuleConstructor(ExecState* exec) : DOMObject(JSCSSRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCSSRulePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCSSRulePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -131,9 +131,9 @@ static const HashTable JSCSSRulePrototypeTable = const ClassInfo JSCSSRulePrototype::s_info = { "CSSRulePrototype", 0, &JSCSSRulePrototypeTable, 0 }; -JSObject* JSCSSRulePrototype::self(ExecState* exec) +JSObject* JSCSSRulePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCSSRule>(exec); + return getDOMPrototype<JSCSSRule>(exec, globalObject); } bool JSCSSRulePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -152,12 +152,11 @@ JSCSSRule::JSCSSRule(PassRefPtr<Structure> structure, PassRefPtr<CSSRule> impl) JSCSSRule::~JSCSSRule() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSCSSRule::createPrototype(ExecState* exec) +JSObject* JSCSSRule::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCSSRulePrototype(JSCSSRulePrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSCSSRulePrototype(JSCSSRulePrototype::createStructure(globalObject->objectPrototype())); } bool JSCSSRule::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -165,40 +164,44 @@ bool JSCSSRule::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa return getStaticValueSlot<JSCSSRule, Base>(exec, &JSCSSRuleTable, this, propertyName, slot); } -JSValuePtr jsCSSRuleType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSRuleType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSRule* imp = static_cast<CSSRule*>(static_cast<JSCSSRule*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->type()); } -JSValuePtr jsCSSRuleCssText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSRuleCssText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSRule* imp = static_cast<CSSRule*>(static_cast<JSCSSRule*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->cssText()); } -JSValuePtr jsCSSRuleParentStyleSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSRuleParentStyleSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSRule* imp = static_cast<CSSRule*>(static_cast<JSCSSRule*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->parentStyleSheet())); } -JSValuePtr jsCSSRuleParentRule(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSRuleParentRule(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSRule* imp = static_cast<CSSRule*>(static_cast<JSCSSRule*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->parentRule())); } -JSValuePtr jsCSSRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCSSRule*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSCSSRule::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSCSSRule::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSCSSRule, Base>(exec, propertyName, value, &JSCSSRuleTable, this, slot); } -void setJSCSSRuleCssText(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCSSRuleCssText(ExecState* exec, JSObject* thisObject, JSValue value) { CSSRule* imp = static_cast<CSSRule*>(static_cast<JSCSSRule*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -206,66 +209,66 @@ void setJSCSSRuleCssText(ExecState* exec, JSObject* thisObject, JSValuePtr value setDOMException(exec, ec); } -JSValuePtr JSCSSRule::getConstructor(ExecState* exec) +JSValue JSCSSRule::getConstructor(ExecState* exec) { return getDOMConstructor<JSCSSRuleConstructor>(exec); } // Constant getters -JSValuePtr jsCSSRuleUNKNOWN_RULE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSRuleUNKNOWN_RULE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsCSSRuleSTYLE_RULE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSRuleSTYLE_RULE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsCSSRuleCHARSET_RULE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSRuleCHARSET_RULE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsCSSRuleIMPORT_RULE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSRuleIMPORT_RULE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsCSSRuleMEDIA_RULE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSRuleMEDIA_RULE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSValuePtr jsCSSRuleFONT_FACE_RULE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSRuleFONT_FACE_RULE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(5)); } -JSValuePtr jsCSSRulePAGE_RULE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSRulePAGE_RULE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(6)); } -JSValuePtr jsCSSRuleVARIABLES_RULE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSRuleVARIABLES_RULE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(7)); } -JSValuePtr jsCSSRuleWEBKIT_KEYFRAMES_RULE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSRuleWEBKIT_KEYFRAMES_RULE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(8)); } -JSValuePtr jsCSSRuleWEBKIT_KEYFRAME_RULE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSRuleWEBKIT_KEYFRAME_RULE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(9)); } -CSSRule* toCSSRule(JSC::JSValuePtr value) +CSSRule* toCSSRule(JSC::JSValue value) { - return value->isObject(&JSCSSRule::s_info) ? static_cast<JSCSSRule*>(asObject(value))->impl() : 0; + return value.isObject(&JSCSSRule::s_info) ? static_cast<JSCSSRule*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSRule.h b/src/3rdparty/webkit/WebCore/generated/JSCSSRule.h index 0412812154..75bb902559 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSRule.h @@ -34,34 +34,35 @@ class JSCSSRule : public DOMObject { public: JSCSSRule(PassRefPtr<JSC::Structure>, PassRefPtr<CSSRule>); virtual ~JSCSSRule(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); CSSRule* impl() const { return m_impl.get(); } private: RefPtr<CSSRule> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, CSSRule*); -CSSRule* toCSSRule(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, CSSRule*); +CSSRule* toCSSRule(JSC::JSValue); class JSCSSRulePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -70,24 +71,24 @@ public: // Attributes -JSC::JSValuePtr jsCSSRuleType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSRuleCssText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCSSRuleCssText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCSSRuleParentStyleSheet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSRuleParentRule(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSRuleType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSRuleCssText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCSSRuleCssText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCSSRuleParentStyleSheet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSRuleParentRule(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsCSSRuleUNKNOWN_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSRuleSTYLE_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSRuleCHARSET_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSRuleIMPORT_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSRuleMEDIA_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSRuleFONT_FACE_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSRulePAGE_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSRuleVARIABLES_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSRuleWEBKIT_KEYFRAMES_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSRuleWEBKIT_KEYFRAME_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSRuleUNKNOWN_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSRuleSTYLE_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSRuleCHARSET_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSRuleIMPORT_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSRuleMEDIA_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSRuleFONT_FACE_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSRulePAGE_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSRuleVARIABLES_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSRuleWEBKIT_KEYFRAMES_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSRuleWEBKIT_KEYFRAME_RULE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSRuleList.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSRuleList.cpp index 5a46eba7fd..5b8c7aa7b0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSRuleList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSRuleList.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCSSRuleList) +ASSERT_CLASS_FITS_IN_CELL(JSCSSRuleList); /* Hash table */ @@ -73,13 +73,13 @@ public: JSCSSRuleListConstructor(ExecState* exec) : DOMObject(JSCSSRuleListConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCSSRuleListPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCSSRuleListPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -109,9 +109,9 @@ static const HashTable JSCSSRuleListPrototypeTable = const ClassInfo JSCSSRuleListPrototype::s_info = { "CSSRuleListPrototype", 0, &JSCSSRuleListPrototypeTable, 0 }; -JSObject* JSCSSRuleListPrototype::self(ExecState* exec) +JSObject* JSCSSRuleListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCSSRuleList>(exec); + return getDOMPrototype<JSCSSRuleList>(exec, globalObject); } bool JSCSSRuleListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -130,12 +130,11 @@ JSCSSRuleList::JSCSSRuleList(PassRefPtr<Structure> structure, PassRefPtr<CSSRule JSCSSRuleList::~JSCSSRuleList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSCSSRuleList::createPrototype(ExecState* exec) +JSObject* JSCSSRuleList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCSSRuleListPrototype(JSCSSRuleListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSCSSRuleListPrototype(JSCSSRuleListPrototype::createStructure(globalObject->objectPrototype())); } bool JSCSSRuleList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -163,13 +162,14 @@ bool JSCSSRuleList::getOwnPropertySlot(ExecState* exec, unsigned propertyName, P return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -JSValuePtr jsCSSRuleListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSRuleListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSRuleList* imp = static_cast<CSSRuleList*>(static_cast<JSCSSRuleList*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsCSSRuleListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSRuleListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCSSRuleList*>(asObject(slot.slotBase()))->getConstructor(exec); } @@ -180,37 +180,38 @@ void JSCSSRuleList::getPropertyNames(ExecState* exec, PropertyNameArray& propert Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSCSSRuleList::getConstructor(ExecState* exec) +JSValue JSCSSRuleList::getConstructor(ExecState* exec) { return getDOMConstructor<JSCSSRuleListConstructor>(exec); } -JSValuePtr jsCSSRuleListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSRuleListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSRuleList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSRuleList::s_info)) return throwError(exec, TypeError); JSCSSRuleList* castedThisObj = static_cast<JSCSSRuleList*>(asObject(thisValue)); CSSRuleList* imp = static_cast<CSSRuleList*>(castedThisObj->impl()); - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); return result; } -JSValuePtr JSCSSRuleList::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue JSCSSRuleList::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSCSSRuleList* thisObj = static_cast<JSCSSRuleList*>(asObject(slot.slotBase())); return toJS(exec, static_cast<CSSRuleList*>(thisObj->impl())->item(slot.index())); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, CSSRuleList* object) +JSC::JSValue toJS(JSC::ExecState* exec, CSSRuleList* object) { return getDOMObjectWrapper<JSCSSRuleList>(exec, object); } -CSSRuleList* toCSSRuleList(JSC::JSValuePtr value) +CSSRuleList* toCSSRuleList(JSC::JSValue value) { - return value->isObject(&JSCSSRuleList::s_info) ? static_cast<JSCSSRuleList*>(asObject(value))->impl() : 0; + return value.isObject(&JSCSSRuleList::s_info) ? static_cast<JSCSSRuleList*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSRuleList.h b/src/3rdparty/webkit/WebCore/generated/JSCSSRuleList.h index 168a1bb65f..ba3180c397 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSRuleList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSRuleList.h @@ -34,36 +34,37 @@ class JSCSSRuleList : public DOMObject { public: JSCSSRuleList(PassRefPtr<JSC::Structure>, PassRefPtr<CSSRuleList>); virtual ~JSCSSRuleList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); CSSRuleList* impl() const { return m_impl.get(); } private: RefPtr<CSSRuleList> m_impl; - static JSC::JSValuePtr indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValuePtr toJS(JSC::ExecState*, CSSRuleList*); -CSSRuleList* toCSSRuleList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, CSSRuleList*); +CSSRuleList* toCSSRuleList(JSC::JSValue); class JSCSSRuleListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -72,11 +73,11 @@ public: // Functions -JSC::JSValuePtr jsCSSRuleListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSRuleListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsCSSRuleListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSRuleListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSRuleListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSRuleListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleDeclaration.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleDeclaration.cpp index 331c1537cb..0a4a1a0249 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleDeclaration.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleDeclaration.cpp @@ -41,7 +41,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCSSStyleDeclaration) +ASSERT_CLASS_FITS_IN_CELL(JSCSSStyleDeclaration); /* Hash table */ @@ -80,13 +80,13 @@ public: JSCSSStyleDeclarationConstructor(ExecState* exec) : DOMObject(JSCSSStyleDeclarationConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCSSStyleDeclarationPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCSSStyleDeclarationPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -123,9 +123,9 @@ static const HashTable JSCSSStyleDeclarationPrototypeTable = const ClassInfo JSCSSStyleDeclarationPrototype::s_info = { "CSSStyleDeclarationPrototype", 0, &JSCSSStyleDeclarationPrototypeTable, 0 }; -JSObject* JSCSSStyleDeclarationPrototype::self(ExecState* exec) +JSObject* JSCSSStyleDeclarationPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCSSStyleDeclaration>(exec); + return getDOMPrototype<JSCSSStyleDeclaration>(exec, globalObject); } bool JSCSSStyleDeclarationPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -144,12 +144,11 @@ JSCSSStyleDeclaration::JSCSSStyleDeclaration(PassRefPtr<Structure> structure, Pa JSCSSStyleDeclaration::~JSCSSStyleDeclaration() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSCSSStyleDeclaration::createPrototype(ExecState* exec) +JSObject* JSCSSStyleDeclaration::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCSSStyleDeclarationPrototype(JSCSSStyleDeclarationPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSCSSStyleDeclarationPrototype(JSCSSStyleDeclarationPrototype::createStructure(globalObject->objectPrototype())); } bool JSCSSStyleDeclaration::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -181,36 +180,39 @@ bool JSCSSStyleDeclaration::getOwnPropertySlot(ExecState* exec, unsigned propert return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -JSValuePtr jsCSSStyleDeclarationCssText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSStyleDeclarationCssText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSStyleDeclaration* imp = static_cast<CSSStyleDeclaration*>(static_cast<JSCSSStyleDeclaration*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->cssText()); } -JSValuePtr jsCSSStyleDeclarationLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSStyleDeclarationLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSStyleDeclaration* imp = static_cast<CSSStyleDeclaration*>(static_cast<JSCSSStyleDeclaration*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsCSSStyleDeclarationParentRule(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSStyleDeclarationParentRule(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSStyleDeclaration* imp = static_cast<CSSStyleDeclaration*>(static_cast<JSCSSStyleDeclaration*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->parentRule())); } -JSValuePtr jsCSSStyleDeclarationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSStyleDeclarationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCSSStyleDeclaration*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSCSSStyleDeclaration::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSCSSStyleDeclaration::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { if (customPut(exec, propertyName, value, slot)) return; lookupPut<JSCSSStyleDeclaration, Base>(exec, propertyName, value, &JSCSSStyleDeclarationTable, this, slot); } -void setJSCSSStyleDeclarationCssText(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCSSStyleDeclarationCssText(ExecState* exec, JSObject* thisObject, JSValue value) { CSSStyleDeclaration* imp = static_cast<CSSStyleDeclaration*>(static_cast<JSCSSStyleDeclaration*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -225,133 +227,141 @@ void JSCSSStyleDeclaration::getPropertyNames(ExecState* exec, PropertyNameArray& Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSCSSStyleDeclaration::getConstructor(ExecState* exec) +JSValue JSCSSStyleDeclaration::getConstructor(ExecState* exec) { return getDOMConstructor<JSCSSStyleDeclarationConstructor>(exec); } -JSValuePtr jsCSSStyleDeclarationPrototypeFunctionGetPropertyValue(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionGetPropertyValue(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSStyleDeclaration::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSStyleDeclaration::s_info)) return throwError(exec, TypeError); JSCSSStyleDeclaration* castedThisObj = static_cast<JSCSSStyleDeclaration*>(asObject(thisValue)); CSSStyleDeclaration* imp = static_cast<CSSStyleDeclaration*>(castedThisObj->impl()); - const UString& propertyName = args.at(exec, 0)->toString(exec); + const UString& propertyName = args.at(0).toString(exec); - JSC::JSValuePtr result = jsStringOrNull(exec, imp->getPropertyValue(propertyName)); + JSC::JSValue result = jsStringOrNull(exec, imp->getPropertyValue(propertyName)); return result; } -JSValuePtr jsCSSStyleDeclarationPrototypeFunctionGetPropertyCSSValue(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionGetPropertyCSSValue(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSStyleDeclaration::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSStyleDeclaration::s_info)) return throwError(exec, TypeError); JSCSSStyleDeclaration* castedThisObj = static_cast<JSCSSStyleDeclaration*>(asObject(thisValue)); CSSStyleDeclaration* imp = static_cast<CSSStyleDeclaration*>(castedThisObj->impl()); - const UString& propertyName = args.at(exec, 0)->toString(exec); + const UString& propertyName = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPropertyCSSValue(propertyName))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPropertyCSSValue(propertyName))); return result; } -JSValuePtr jsCSSStyleDeclarationPrototypeFunctionRemoveProperty(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionRemoveProperty(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSStyleDeclaration::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSStyleDeclaration::s_info)) return throwError(exec, TypeError); JSCSSStyleDeclaration* castedThisObj = static_cast<JSCSSStyleDeclaration*>(asObject(thisValue)); CSSStyleDeclaration* imp = static_cast<CSSStyleDeclaration*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& propertyName = args.at(exec, 0)->toString(exec); + const UString& propertyName = args.at(0).toString(exec); - JSC::JSValuePtr result = jsStringOrNull(exec, imp->removeProperty(propertyName, ec)); + JSC::JSValue result = jsStringOrNull(exec, imp->removeProperty(propertyName, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsCSSStyleDeclarationPrototypeFunctionGetPropertyPriority(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionGetPropertyPriority(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSStyleDeclaration::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSStyleDeclaration::s_info)) return throwError(exec, TypeError); JSCSSStyleDeclaration* castedThisObj = static_cast<JSCSSStyleDeclaration*>(asObject(thisValue)); CSSStyleDeclaration* imp = static_cast<CSSStyleDeclaration*>(castedThisObj->impl()); - const UString& propertyName = args.at(exec, 0)->toString(exec); + const UString& propertyName = args.at(0).toString(exec); - JSC::JSValuePtr result = jsStringOrNull(exec, imp->getPropertyPriority(propertyName)); + JSC::JSValue result = jsStringOrNull(exec, imp->getPropertyPriority(propertyName)); return result; } -JSValuePtr jsCSSStyleDeclarationPrototypeFunctionSetProperty(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionSetProperty(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSStyleDeclaration::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSStyleDeclaration::s_info)) return throwError(exec, TypeError); JSCSSStyleDeclaration* castedThisObj = static_cast<JSCSSStyleDeclaration*>(asObject(thisValue)); CSSStyleDeclaration* imp = static_cast<CSSStyleDeclaration*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& propertyName = args.at(exec, 0)->toString(exec); - const UString& value = valueToStringWithNullCheck(exec, args.at(exec, 1)); - const UString& priority = args.at(exec, 2)->toString(exec); + const UString& propertyName = args.at(0).toString(exec); + const UString& value = valueToStringWithNullCheck(exec, args.at(1)); + const UString& priority = args.at(2).toString(exec); imp->setProperty(propertyName, value, priority, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsCSSStyleDeclarationPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSStyleDeclaration::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSStyleDeclaration::s_info)) return throwError(exec, TypeError); JSCSSStyleDeclaration* castedThisObj = static_cast<JSCSSStyleDeclaration*>(asObject(thisValue)); CSSStyleDeclaration* imp = static_cast<CSSStyleDeclaration*>(castedThisObj->impl()); - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = jsStringOrNull(exec, imp->item(index)); + JSC::JSValue result = jsStringOrNull(exec, imp->item(index)); return result; } -JSValuePtr jsCSSStyleDeclarationPrototypeFunctionGetPropertyShorthand(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionGetPropertyShorthand(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSStyleDeclaration::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSStyleDeclaration::s_info)) return throwError(exec, TypeError); JSCSSStyleDeclaration* castedThisObj = static_cast<JSCSSStyleDeclaration*>(asObject(thisValue)); CSSStyleDeclaration* imp = static_cast<CSSStyleDeclaration*>(castedThisObj->impl()); - const UString& propertyName = args.at(exec, 0)->toString(exec); + const UString& propertyName = args.at(0).toString(exec); - JSC::JSValuePtr result = jsStringOrNull(exec, imp->getPropertyShorthand(propertyName)); + JSC::JSValue result = jsStringOrNull(exec, imp->getPropertyShorthand(propertyName)); return result; } -JSValuePtr jsCSSStyleDeclarationPrototypeFunctionIsPropertyImplicit(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionIsPropertyImplicit(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSStyleDeclaration::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSStyleDeclaration::s_info)) return throwError(exec, TypeError); JSCSSStyleDeclaration* castedThisObj = static_cast<JSCSSStyleDeclaration*>(asObject(thisValue)); CSSStyleDeclaration* imp = static_cast<CSSStyleDeclaration*>(castedThisObj->impl()); - const UString& propertyName = args.at(exec, 0)->toString(exec); + const UString& propertyName = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->isPropertyImplicit(propertyName)); + JSC::JSValue result = jsBoolean(imp->isPropertyImplicit(propertyName)); return result; } -JSValuePtr JSCSSStyleDeclaration::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue JSCSSStyleDeclaration::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSCSSStyleDeclaration* thisObj = static_cast<JSCSSStyleDeclaration*>(asObject(slot.slotBase())); return jsStringOrNull(exec, thisObj->impl()->item(slot.index())); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, CSSStyleDeclaration* object) +JSC::JSValue toJS(JSC::ExecState* exec, CSSStyleDeclaration* object) { return getDOMObjectWrapper<JSCSSStyleDeclaration>(exec, object); } -CSSStyleDeclaration* toCSSStyleDeclaration(JSC::JSValuePtr value) +CSSStyleDeclaration* toCSSStyleDeclaration(JSC::JSValue value) { - return value->isObject(&JSCSSStyleDeclaration::s_info) ? static_cast<JSCSSStyleDeclaration*>(asObject(value))->impl() : 0; + return value.isObject(&JSCSSStyleDeclaration::s_info) ? static_cast<JSCSSStyleDeclaration*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleDeclaration.h b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleDeclaration.h index 5e9331e629..704048e0d5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleDeclaration.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleDeclaration.h @@ -34,41 +34,42 @@ class JSCSSStyleDeclaration : public DOMObject { public: JSCSSStyleDeclaration(PassRefPtr<JSC::Structure>, PassRefPtr<CSSStyleDeclaration>); virtual ~JSCSSStyleDeclaration(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); - bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); + bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); CSSStyleDeclaration* impl() const { return m_impl.get(); } private: RefPtr<CSSStyleDeclaration> m_impl; - static JSC::JSValuePtr indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); private: static bool canGetItemsForName(JSC::ExecState*, CSSStyleDeclaration*, const JSC::Identifier&); - static JSC::JSValuePtr nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValuePtr toJS(JSC::ExecState*, CSSStyleDeclaration*); -CSSStyleDeclaration* toCSSStyleDeclaration(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, CSSStyleDeclaration*); +CSSStyleDeclaration* toCSSStyleDeclaration(JSC::JSValue); class JSCSSStyleDeclarationPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -77,21 +78,21 @@ public: // Functions -JSC::JSValuePtr jsCSSStyleDeclarationPrototypeFunctionGetPropertyValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSStyleDeclarationPrototypeFunctionGetPropertyCSSValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSStyleDeclarationPrototypeFunctionRemoveProperty(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSStyleDeclarationPrototypeFunctionGetPropertyPriority(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSStyleDeclarationPrototypeFunctionSetProperty(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSStyleDeclarationPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSStyleDeclarationPrototypeFunctionGetPropertyShorthand(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSStyleDeclarationPrototypeFunctionIsPropertyImplicit(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionGetPropertyValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionGetPropertyCSSValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionRemoveProperty(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionGetPropertyPriority(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionSetProperty(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionGetPropertyShorthand(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionIsPropertyImplicit(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsCSSStyleDeclarationCssText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCSSStyleDeclarationCssText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCSSStyleDeclarationLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSStyleDeclarationParentRule(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSStyleDeclarationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSStyleDeclarationCssText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCSSStyleDeclarationCssText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCSSStyleDeclarationLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSStyleDeclarationParentRule(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSStyleDeclarationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleRule.cpp index b44b910221..51179c0acf 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleRule.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCSSStyleRule) +ASSERT_CLASS_FITS_IN_CELL(JSCSSStyleRule); /* Hash table */ @@ -74,13 +74,13 @@ public: JSCSSStyleRuleConstructor(ExecState* exec) : DOMObject(JSCSSStyleRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCSSStyleRulePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCSSStyleRulePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -109,9 +109,9 @@ static const HashTable JSCSSStyleRulePrototypeTable = const ClassInfo JSCSSStyleRulePrototype::s_info = { "CSSStyleRulePrototype", 0, &JSCSSStyleRulePrototypeTable, 0 }; -JSObject* JSCSSStyleRulePrototype::self(ExecState* exec) +JSObject* JSCSSStyleRulePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCSSStyleRule>(exec); + return getDOMPrototype<JSCSSStyleRule>(exec, globalObject); } const ClassInfo JSCSSStyleRule::s_info = { "CSSStyleRule", &JSCSSRule::s_info, &JSCSSStyleRuleTable, 0 }; @@ -121,9 +121,9 @@ JSCSSStyleRule::JSCSSStyleRule(PassRefPtr<Structure> structure, PassRefPtr<CSSSt { } -JSObject* JSCSSStyleRule::createPrototype(ExecState* exec) +JSObject* JSCSSStyleRule::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCSSStyleRulePrototype(JSCSSStyleRulePrototype::createStructure(JSCSSRulePrototype::self(exec))); + return new (exec) JSCSSStyleRulePrototype(JSCSSStyleRulePrototype::createStructure(JSCSSRulePrototype::self(exec, globalObject))); } bool JSCSSStyleRule::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -131,28 +131,30 @@ bool JSCSSStyleRule::getOwnPropertySlot(ExecState* exec, const Identifier& prope return getStaticValueSlot<JSCSSStyleRule, Base>(exec, &JSCSSStyleRuleTable, this, propertyName, slot); } -JSValuePtr jsCSSStyleRuleSelectorText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSStyleRuleSelectorText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSStyleRule* imp = static_cast<CSSStyleRule*>(static_cast<JSCSSStyleRule*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->selectorText()); } -JSValuePtr jsCSSStyleRuleStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSStyleRuleStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSStyleRule* imp = static_cast<CSSStyleRule*>(static_cast<JSCSSStyleRule*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsCSSStyleRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSStyleRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCSSStyleRule*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSCSSStyleRule::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSCSSStyleRule::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSCSSStyleRule, Base>(exec, propertyName, value, &JSCSSStyleRuleTable, this, slot); } -void setJSCSSStyleRuleSelectorText(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCSSStyleRuleSelectorText(ExecState* exec, JSObject* thisObject, JSValue value) { CSSStyleRule* imp = static_cast<CSSStyleRule*>(static_cast<JSCSSStyleRule*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -160,7 +162,7 @@ void setJSCSSStyleRuleSelectorText(ExecState* exec, JSObject* thisObject, JSValu setDOMException(exec, ec); } -JSValuePtr JSCSSStyleRule::getConstructor(ExecState* exec) +JSValue JSCSSStyleRule::getConstructor(ExecState* exec) { return getDOMConstructor<JSCSSStyleRuleConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleRule.h b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleRule.h index 9cb2788532..4f65c87de0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleRule.h @@ -31,24 +31,25 @@ class JSCSSStyleRule : public JSCSSRule { typedef JSCSSRule Base; public: JSCSSStyleRule(PassRefPtr<JSC::Structure>, PassRefPtr<CSSStyleRule>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSCSSStyleRulePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSCSSStyleRulePrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,10 +57,10 @@ public: // Attributes -JSC::JSValuePtr jsCSSStyleRuleSelectorText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCSSStyleRuleSelectorText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCSSStyleRuleStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSStyleRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSStyleRuleSelectorText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCSSStyleRuleSelectorText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCSSStyleRuleStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSStyleRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleSheet.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleSheet.cpp index 36395c1c30..6a3f2f2b5c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleSheet.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleSheet.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCSSStyleSheet) +ASSERT_CLASS_FITS_IN_CELL(JSCSSStyleSheet); /* Hash table */ @@ -76,13 +76,13 @@ public: JSCSSStyleSheetConstructor(ExecState* exec) : DOMObject(JSCSSStyleSheetConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCSSStyleSheetPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCSSStyleSheetPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -115,9 +115,9 @@ static const HashTable JSCSSStyleSheetPrototypeTable = const ClassInfo JSCSSStyleSheetPrototype::s_info = { "CSSStyleSheetPrototype", 0, &JSCSSStyleSheetPrototypeTable, 0 }; -JSObject* JSCSSStyleSheetPrototype::self(ExecState* exec) +JSObject* JSCSSStyleSheetPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCSSStyleSheet>(exec); + return getDOMPrototype<JSCSSStyleSheet>(exec, globalObject); } bool JSCSSStyleSheetPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -132,9 +132,9 @@ JSCSSStyleSheet::JSCSSStyleSheet(PassRefPtr<Structure> structure, PassRefPtr<CSS { } -JSObject* JSCSSStyleSheet::createPrototype(ExecState* exec) +JSObject* JSCSSStyleSheet::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCSSStyleSheetPrototype(JSCSSStyleSheetPrototype::createStructure(JSStyleSheetPrototype::self(exec))); + return new (exec) JSCSSStyleSheetPrototype(JSCSSStyleSheetPrototype::createStructure(JSStyleSheetPrototype::self(exec, globalObject))); } bool JSCSSStyleSheet::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -142,97 +142,104 @@ bool JSCSSStyleSheet::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSCSSStyleSheet, Base>(exec, &JSCSSStyleSheetTable, this, propertyName, slot); } -JSValuePtr jsCSSStyleSheetOwnerRule(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSStyleSheetOwnerRule(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSStyleSheet* imp = static_cast<CSSStyleSheet*>(static_cast<JSCSSStyleSheet*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->ownerRule())); } -JSValuePtr jsCSSStyleSheetCssRules(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSStyleSheetCssRules(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSStyleSheet* imp = static_cast<CSSStyleSheet*>(static_cast<JSCSSStyleSheet*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->cssRules())); } -JSValuePtr jsCSSStyleSheetRules(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSStyleSheetRules(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSStyleSheet* imp = static_cast<CSSStyleSheet*>(static_cast<JSCSSStyleSheet*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->rules())); } -JSValuePtr jsCSSStyleSheetConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSStyleSheetConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCSSStyleSheet*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSCSSStyleSheet::getConstructor(ExecState* exec) +JSValue JSCSSStyleSheet::getConstructor(ExecState* exec) { return getDOMConstructor<JSCSSStyleSheetConstructor>(exec); } -JSValuePtr jsCSSStyleSheetPrototypeFunctionInsertRule(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSStyleSheetPrototypeFunctionInsertRule(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSStyleSheet::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSStyleSheet::s_info)) return throwError(exec, TypeError); JSCSSStyleSheet* castedThisObj = static_cast<JSCSSStyleSheet*>(asObject(thisValue)); CSSStyleSheet* imp = static_cast<CSSStyleSheet*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& rule = args.at(exec, 0)->toString(exec); - unsigned index = args.at(exec, 1)->toInt32(exec); + const UString& rule = args.at(0).toString(exec); + unsigned index = args.at(1).toInt32(exec); - JSC::JSValuePtr result = jsNumber(exec, imp->insertRule(rule, index, ec)); + JSC::JSValue result = jsNumber(exec, imp->insertRule(rule, index, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsCSSStyleSheetPrototypeFunctionDeleteRule(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSStyleSheetPrototypeFunctionDeleteRule(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSStyleSheet::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSStyleSheet::s_info)) return throwError(exec, TypeError); JSCSSStyleSheet* castedThisObj = static_cast<JSCSSStyleSheet*>(asObject(thisValue)); CSSStyleSheet* imp = static_cast<CSSStyleSheet*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); imp->deleteRule(index, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsCSSStyleSheetPrototypeFunctionAddRule(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSStyleSheetPrototypeFunctionAddRule(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSStyleSheet::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSStyleSheet::s_info)) return throwError(exec, TypeError); JSCSSStyleSheet* castedThisObj = static_cast<JSCSSStyleSheet*>(asObject(thisValue)); CSSStyleSheet* imp = static_cast<CSSStyleSheet*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& selector = args.at(exec, 0)->toString(exec); - const UString& style = args.at(exec, 1)->toString(exec); + const UString& selector = args.at(0).toString(exec); + const UString& style = args.at(1).toString(exec); int argsCount = args.size(); if (argsCount < 3) { - JSC::JSValuePtr result = jsNumber(exec, imp->addRule(selector, style, ec)); + JSC::JSValue result = jsNumber(exec, imp->addRule(selector, style, ec)); setDOMException(exec, ec); return result; } - unsigned index = args.at(exec, 2)->toInt32(exec); + unsigned index = args.at(2).toInt32(exec); - JSC::JSValuePtr result = jsNumber(exec, imp->addRule(selector, style, index, ec)); + JSC::JSValue result = jsNumber(exec, imp->addRule(selector, style, index, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsCSSStyleSheetPrototypeFunctionRemoveRule(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSStyleSheetPrototypeFunctionRemoveRule(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSStyleSheet::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSStyleSheet::s_info)) return throwError(exec, TypeError); JSCSSStyleSheet* castedThisObj = static_cast<JSCSSStyleSheet*>(asObject(thisValue)); CSSStyleSheet* imp = static_cast<CSSStyleSheet*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); imp->removeRule(index, ec); setDOMException(exec, ec); diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleSheet.h b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleSheet.h index dedf1ca4bb..bd048f26cb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleSheet.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleSheet.h @@ -31,27 +31,28 @@ class JSCSSStyleSheet : public JSStyleSheet { typedef JSStyleSheet Base; public: JSCSSStyleSheet(PassRefPtr<JSC::Structure>, PassRefPtr<CSSStyleSheet>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSCSSStyleSheetPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,16 +61,16 @@ public: // Functions -JSC::JSValuePtr jsCSSStyleSheetPrototypeFunctionInsertRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSStyleSheetPrototypeFunctionDeleteRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSStyleSheetPrototypeFunctionAddRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSStyleSheetPrototypeFunctionRemoveRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSStyleSheetPrototypeFunctionInsertRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSStyleSheetPrototypeFunctionDeleteRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSStyleSheetPrototypeFunctionAddRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSStyleSheetPrototypeFunctionRemoveRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsCSSStyleSheetOwnerRule(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSStyleSheetCssRules(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSStyleSheetRules(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSStyleSheetConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSStyleSheetOwnerRule(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSStyleSheetCssRules(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSStyleSheetRules(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSStyleSheetConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSValue.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSValue.cpp index 50ee92bf2d..da216fd846 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSValue.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSValue.cpp @@ -33,7 +33,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCSSValue) +ASSERT_CLASS_FITS_IN_CELL(JSCSSValue); /* Hash table */ @@ -75,13 +75,13 @@ public: JSCSSValueConstructor(ExecState* exec) : DOMObject(JSCSSValueConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCSSValuePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCSSValuePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -114,9 +114,9 @@ static const HashTable JSCSSValuePrototypeTable = const ClassInfo JSCSSValuePrototype::s_info = { "CSSValuePrototype", 0, &JSCSSValuePrototypeTable, 0 }; -JSObject* JSCSSValuePrototype::self(ExecState* exec) +JSObject* JSCSSValuePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCSSValue>(exec); + return getDOMPrototype<JSCSSValue>(exec, globalObject); } bool JSCSSValuePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -135,12 +135,11 @@ JSCSSValue::JSCSSValue(PassRefPtr<Structure> structure, PassRefPtr<CSSValue> imp JSCSSValue::~JSCSSValue() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSCSSValue::createPrototype(ExecState* exec) +JSObject* JSCSSValue::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCSSValuePrototype(JSCSSValuePrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSCSSValuePrototype(JSCSSValuePrototype::createStructure(globalObject->objectPrototype())); } bool JSCSSValue::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -148,28 +147,30 @@ bool JSCSSValue::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN return getStaticValueSlot<JSCSSValue, Base>(exec, &JSCSSValueTable, this, propertyName, slot); } -JSValuePtr jsCSSValueCssText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSValueCssText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSValue* imp = static_cast<CSSValue*>(static_cast<JSCSSValue*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->cssText()); } -JSValuePtr jsCSSValueCssValueType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSValueCssValueType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSValue* imp = static_cast<CSSValue*>(static_cast<JSCSSValue*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->cssValueType()); } -JSValuePtr jsCSSValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCSSValue*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSCSSValue::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSCSSValue::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSCSSValue, Base>(exec, propertyName, value, &JSCSSValueTable, this, slot); } -void setJSCSSValueCssText(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCSSValueCssText(ExecState* exec, JSObject* thisObject, JSValue value) { CSSValue* imp = static_cast<CSSValue*>(static_cast<JSCSSValue*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -177,36 +178,36 @@ void setJSCSSValueCssText(ExecState* exec, JSObject* thisObject, JSValuePtr valu setDOMException(exec, ec); } -JSValuePtr JSCSSValue::getConstructor(ExecState* exec) +JSValue JSCSSValue::getConstructor(ExecState* exec) { return getDOMConstructor<JSCSSValueConstructor>(exec); } // Constant getters -JSValuePtr jsCSSValueCSS_INHERIT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSValueCSS_INHERIT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsCSSValueCSS_PRIMITIVE_VALUE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSValueCSS_PRIMITIVE_VALUE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsCSSValueCSS_VALUE_LIST(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSValueCSS_VALUE_LIST(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsCSSValueCSS_CUSTOM(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsCSSValueCSS_CUSTOM(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -CSSValue* toCSSValue(JSC::JSValuePtr value) +CSSValue* toCSSValue(JSC::JSValue value) { - return value->isObject(&JSCSSValue::s_info) ? static_cast<JSCSSValue*>(asObject(value))->impl() : 0; + return value.isObject(&JSCSSValue::s_info) ? static_cast<JSCSSValue*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSValue.h b/src/3rdparty/webkit/WebCore/generated/JSCSSValue.h index ece0f07a1c..d38c5c4296 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSValue.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSValue.h @@ -34,34 +34,35 @@ class JSCSSValue : public DOMObject { public: JSCSSValue(PassRefPtr<JSC::Structure>, PassRefPtr<CSSValue>); virtual ~JSCSSValue(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); CSSValue* impl() const { return m_impl.get(); } private: RefPtr<CSSValue> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, CSSValue*); -CSSValue* toCSSValue(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, CSSValue*); +CSSValue* toCSSValue(JSC::JSValue); class JSCSSValuePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -70,16 +71,16 @@ public: // Attributes -JSC::JSValuePtr jsCSSValueCssText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCSSValueCssText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCSSValueCssValueType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSValueConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSValueCssText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCSSValueCssText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCSSValueCssValueType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSValueConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsCSSValueCSS_INHERIT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSValueCSS_PRIMITIVE_VALUE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSValueCSS_VALUE_LIST(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSValueCSS_CUSTOM(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSValueCSS_INHERIT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSValueCSS_PRIMITIVE_VALUE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSValueCSS_VALUE_LIST(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSValueCSS_CUSTOM(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSValueList.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSValueList.cpp index f5cc5ea34b..5a0096884e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSValueList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSValueList.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCSSValueList) +ASSERT_CLASS_FITS_IN_CELL(JSCSSValueList); /* Hash table */ @@ -73,13 +73,13 @@ public: JSCSSValueListConstructor(ExecState* exec) : DOMObject(JSCSSValueListConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCSSValueListPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCSSValueListPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -109,9 +109,9 @@ static const HashTable JSCSSValueListPrototypeTable = const ClassInfo JSCSSValueListPrototype::s_info = { "CSSValueListPrototype", 0, &JSCSSValueListPrototypeTable, 0 }; -JSObject* JSCSSValueListPrototype::self(ExecState* exec) +JSObject* JSCSSValueListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCSSValueList>(exec); + return getDOMPrototype<JSCSSValueList>(exec, globalObject); } bool JSCSSValueListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -126,9 +126,9 @@ JSCSSValueList::JSCSSValueList(PassRefPtr<Structure> structure, PassRefPtr<CSSVa { } -JSObject* JSCSSValueList::createPrototype(ExecState* exec) +JSObject* JSCSSValueList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCSSValueListPrototype(JSCSSValueListPrototype::createStructure(JSCSSValuePrototype::self(exec))); + return new (exec) JSCSSValueListPrototype(JSCSSValueListPrototype::createStructure(JSCSSValuePrototype::self(exec, globalObject))); } bool JSCSSValueList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -156,13 +156,14 @@ bool JSCSSValueList::getOwnPropertySlot(ExecState* exec, unsigned propertyName, return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -JSValuePtr jsCSSValueListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSValueListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSValueList* imp = static_cast<CSSValueList*>(static_cast<JSCSSValueList*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsCSSValueListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSValueListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCSSValueList*>(asObject(slot.slotBase()))->getConstructor(exec); } @@ -173,26 +174,27 @@ void JSCSSValueList::getPropertyNames(ExecState* exec, PropertyNameArray& proper Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSCSSValueList::getConstructor(ExecState* exec) +JSValue JSCSSValueList::getConstructor(ExecState* exec) { return getDOMConstructor<JSCSSValueListConstructor>(exec); } -JSValuePtr jsCSSValueListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSValueListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSValueList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSValueList::s_info)) return throwError(exec, TypeError); JSCSSValueList* castedThisObj = static_cast<JSCSSValueList*>(asObject(thisValue)); CSSValueList* imp = static_cast<CSSValueList*>(castedThisObj->impl()); - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); return result; } -JSValuePtr JSCSSValueList::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue JSCSSValueList::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSCSSValueList* thisObj = static_cast<JSCSSValueList*>(asObject(slot.slotBase())); return toJS(exec, static_cast<CSSValueList*>(thisObj->impl())->item(slot.index())); diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSValueList.h b/src/3rdparty/webkit/WebCore/generated/JSCSSValueList.h index 892698c89f..3d350937a8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSValueList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSValueList.h @@ -31,30 +31,31 @@ class JSCSSValueList : public JSCSSValue { typedef JSCSSValue Base; public: JSCSSValueList(PassRefPtr<JSC::Structure>, PassRefPtr<CSSValueList>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); - static JSC::JSValuePtr indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; class JSCSSValueListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,11 +64,11 @@ public: // Functions -JSC::JSValuePtr jsCSSValueListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSValueListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsCSSValueListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSValueListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSValueListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSValueListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesDeclaration.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesDeclaration.cpp index 28b76732b7..24ff9bcd65 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesDeclaration.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesDeclaration.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCSSVariablesDeclaration) +ASSERT_CLASS_FITS_IN_CELL(JSCSSVariablesDeclaration); /* Hash table */ @@ -77,13 +77,13 @@ public: JSCSSVariablesDeclarationConstructor(ExecState* exec) : DOMObject(JSCSSVariablesDeclarationConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCSSVariablesDeclarationPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCSSVariablesDeclarationPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -116,9 +116,9 @@ static const HashTable JSCSSVariablesDeclarationPrototypeTable = const ClassInfo JSCSSVariablesDeclarationPrototype::s_info = { "CSSVariablesDeclarationPrototype", 0, &JSCSSVariablesDeclarationPrototypeTable, 0 }; -JSObject* JSCSSVariablesDeclarationPrototype::self(ExecState* exec) +JSObject* JSCSSVariablesDeclarationPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCSSVariablesDeclaration>(exec); + return getDOMPrototype<JSCSSVariablesDeclaration>(exec, globalObject); } bool JSCSSVariablesDeclarationPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -137,12 +137,11 @@ JSCSSVariablesDeclaration::JSCSSVariablesDeclaration(PassRefPtr<Structure> struc JSCSSVariablesDeclaration::~JSCSSVariablesDeclaration() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSCSSVariablesDeclaration::createPrototype(ExecState* exec) +JSObject* JSCSSVariablesDeclaration::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCSSVariablesDeclarationPrototype(JSCSSVariablesDeclarationPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSCSSVariablesDeclarationPrototype(JSCSSVariablesDeclarationPrototype::createStructure(globalObject->objectPrototype())); } bool JSCSSVariablesDeclaration::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -170,37 +169,40 @@ bool JSCSSVariablesDeclaration::getOwnPropertySlot(ExecState* exec, unsigned pro return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -JSValuePtr jsCSSVariablesDeclarationCssText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSVariablesDeclarationCssText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSVariablesDeclaration* imp = static_cast<CSSVariablesDeclaration*>(static_cast<JSCSSVariablesDeclaration*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->cssText()); } -JSValuePtr jsCSSVariablesDeclarationLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSVariablesDeclarationLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSVariablesDeclaration* imp = static_cast<CSSVariablesDeclaration*>(static_cast<JSCSSVariablesDeclaration*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsCSSVariablesDeclarationParentRule(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSVariablesDeclarationParentRule(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSVariablesDeclaration* imp = static_cast<CSSVariablesDeclaration*>(static_cast<JSCSSVariablesDeclaration*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->parentRule())); } -JSValuePtr jsCSSVariablesDeclarationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSVariablesDeclarationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCSSVariablesDeclaration*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSCSSVariablesDeclaration::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSCSSVariablesDeclaration::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSCSSVariablesDeclaration, Base>(exec, propertyName, value, &JSCSSVariablesDeclarationTable, this, slot); } -void setJSCSSVariablesDeclarationCssText(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCSSVariablesDeclarationCssText(ExecState* exec, JSObject* thisObject, JSValue value) { CSSVariablesDeclaration* imp = static_cast<CSSVariablesDeclaration*>(static_cast<JSCSSVariablesDeclaration*>(thisObject)->impl()); - imp->setCssText(value->toString(exec)); + imp->setCssText(value.toString(exec)); } void JSCSSVariablesDeclaration::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames) @@ -210,80 +212,84 @@ void JSCSSVariablesDeclaration::getPropertyNames(ExecState* exec, PropertyNameAr Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSCSSVariablesDeclaration::getConstructor(ExecState* exec) +JSValue JSCSSVariablesDeclaration::getConstructor(ExecState* exec) { return getDOMConstructor<JSCSSVariablesDeclarationConstructor>(exec); } -JSValuePtr jsCSSVariablesDeclarationPrototypeFunctionGetVariableValue(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSVariablesDeclarationPrototypeFunctionGetVariableValue(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSVariablesDeclaration::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSVariablesDeclaration::s_info)) return throwError(exec, TypeError); JSCSSVariablesDeclaration* castedThisObj = static_cast<JSCSSVariablesDeclaration*>(asObject(thisValue)); CSSVariablesDeclaration* imp = static_cast<CSSVariablesDeclaration*>(castedThisObj->impl()); - const UString& variableName = args.at(exec, 0)->toString(exec); + const UString& variableName = args.at(0).toString(exec); - JSC::JSValuePtr result = jsString(exec, imp->getVariableValue(variableName)); + JSC::JSValue result = jsString(exec, imp->getVariableValue(variableName)); return result; } -JSValuePtr jsCSSVariablesDeclarationPrototypeFunctionRemoveVariable(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSVariablesDeclarationPrototypeFunctionRemoveVariable(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSVariablesDeclaration::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSVariablesDeclaration::s_info)) return throwError(exec, TypeError); JSCSSVariablesDeclaration* castedThisObj = static_cast<JSCSSVariablesDeclaration*>(asObject(thisValue)); CSSVariablesDeclaration* imp = static_cast<CSSVariablesDeclaration*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& variableName = args.at(exec, 0)->toString(exec); + const UString& variableName = args.at(0).toString(exec); - JSC::JSValuePtr result = jsString(exec, imp->removeVariable(variableName, ec)); + JSC::JSValue result = jsString(exec, imp->removeVariable(variableName, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsCSSVariablesDeclarationPrototypeFunctionSetVariable(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSVariablesDeclarationPrototypeFunctionSetVariable(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSVariablesDeclaration::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSVariablesDeclaration::s_info)) return throwError(exec, TypeError); JSCSSVariablesDeclaration* castedThisObj = static_cast<JSCSSVariablesDeclaration*>(asObject(thisValue)); CSSVariablesDeclaration* imp = static_cast<CSSVariablesDeclaration*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& variableName = args.at(exec, 0)->toString(exec); - const UString& value = args.at(exec, 1)->toString(exec); + const UString& variableName = args.at(0).toString(exec); + const UString& value = args.at(1).toString(exec); imp->setVariable(variableName, value, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsCSSVariablesDeclarationPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCSSVariablesDeclarationPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCSSVariablesDeclaration::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCSSVariablesDeclaration::s_info)) return throwError(exec, TypeError); JSCSSVariablesDeclaration* castedThisObj = static_cast<JSCSSVariablesDeclaration*>(asObject(thisValue)); CSSVariablesDeclaration* imp = static_cast<CSSVariablesDeclaration*>(castedThisObj->impl()); - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = jsString(exec, imp->item(index)); + JSC::JSValue result = jsString(exec, imp->item(index)); return result; } -JSValuePtr JSCSSVariablesDeclaration::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue JSCSSVariablesDeclaration::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSCSSVariablesDeclaration* thisObj = static_cast<JSCSSVariablesDeclaration*>(asObject(slot.slotBase())); return jsStringOrNull(exec, thisObj->impl()->item(slot.index())); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, CSSVariablesDeclaration* object) +JSC::JSValue toJS(JSC::ExecState* exec, CSSVariablesDeclaration* object) { return getDOMObjectWrapper<JSCSSVariablesDeclaration>(exec, object); } -CSSVariablesDeclaration* toCSSVariablesDeclaration(JSC::JSValuePtr value) +CSSVariablesDeclaration* toCSSVariablesDeclaration(JSC::JSValue value) { - return value->isObject(&JSCSSVariablesDeclaration::s_info) ? static_cast<JSCSSVariablesDeclaration*>(asObject(value))->impl() : 0; + return value.isObject(&JSCSSVariablesDeclaration::s_info) ? static_cast<JSCSSVariablesDeclaration*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesDeclaration.h b/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesDeclaration.h index 8d0e2b9457..fe98f8e13c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesDeclaration.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesDeclaration.h @@ -34,37 +34,38 @@ class JSCSSVariablesDeclaration : public DOMObject { public: JSCSSVariablesDeclaration(PassRefPtr<JSC::Structure>, PassRefPtr<CSSVariablesDeclaration>); virtual ~JSCSSVariablesDeclaration(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); CSSVariablesDeclaration* impl() const { return m_impl.get(); } private: RefPtr<CSSVariablesDeclaration> m_impl; - static JSC::JSValuePtr indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValuePtr toJS(JSC::ExecState*, CSSVariablesDeclaration*); -CSSVariablesDeclaration* toCSSVariablesDeclaration(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, CSSVariablesDeclaration*); +CSSVariablesDeclaration* toCSSVariablesDeclaration(JSC::JSValue); class JSCSSVariablesDeclarationPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -73,17 +74,17 @@ public: // Functions -JSC::JSValuePtr jsCSSVariablesDeclarationPrototypeFunctionGetVariableValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSVariablesDeclarationPrototypeFunctionRemoveVariable(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSVariablesDeclarationPrototypeFunctionSetVariable(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCSSVariablesDeclarationPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSVariablesDeclarationPrototypeFunctionGetVariableValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSVariablesDeclarationPrototypeFunctionRemoveVariable(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSVariablesDeclarationPrototypeFunctionSetVariable(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCSSVariablesDeclarationPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsCSSVariablesDeclarationCssText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCSSVariablesDeclarationCssText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCSSVariablesDeclarationLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSVariablesDeclarationParentRule(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSVariablesDeclarationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSVariablesDeclarationCssText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCSSVariablesDeclarationCssText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCSSVariablesDeclarationLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSVariablesDeclarationParentRule(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSVariablesDeclarationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesRule.cpp index 1e80477385..7a4753fa14 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesRule.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCSSVariablesRule) +ASSERT_CLASS_FITS_IN_CELL(JSCSSVariablesRule); /* Hash table */ @@ -74,13 +74,13 @@ public: JSCSSVariablesRuleConstructor(ExecState* exec) : DOMObject(JSCSSVariablesRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCSSVariablesRulePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCSSVariablesRulePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -109,9 +109,9 @@ static const HashTable JSCSSVariablesRulePrototypeTable = const ClassInfo JSCSSVariablesRulePrototype::s_info = { "CSSVariablesRulePrototype", 0, &JSCSSVariablesRulePrototypeTable, 0 }; -JSObject* JSCSSVariablesRulePrototype::self(ExecState* exec) +JSObject* JSCSSVariablesRulePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCSSVariablesRule>(exec); + return getDOMPrototype<JSCSSVariablesRule>(exec, globalObject); } const ClassInfo JSCSSVariablesRule::s_info = { "CSSVariablesRule", &JSCSSRule::s_info, &JSCSSVariablesRuleTable, 0 }; @@ -121,9 +121,9 @@ JSCSSVariablesRule::JSCSSVariablesRule(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSCSSVariablesRule::createPrototype(ExecState* exec) +JSObject* JSCSSVariablesRule::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCSSVariablesRulePrototype(JSCSSVariablesRulePrototype::createStructure(JSCSSRulePrototype::self(exec))); + return new (exec) JSCSSVariablesRulePrototype(JSCSSVariablesRulePrototype::createStructure(JSCSSRulePrototype::self(exec, globalObject))); } bool JSCSSVariablesRule::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -131,23 +131,25 @@ bool JSCSSVariablesRule::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSCSSVariablesRule, Base>(exec, &JSCSSVariablesRuleTable, this, propertyName, slot); } -JSValuePtr jsCSSVariablesRuleMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSVariablesRuleMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSVariablesRule* imp = static_cast<CSSVariablesRule*>(static_cast<JSCSSVariablesRule*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->media())); } -JSValuePtr jsCSSVariablesRuleVariables(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSVariablesRuleVariables(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CSSVariablesRule* imp = static_cast<CSSVariablesRule*>(static_cast<JSCSSVariablesRule*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->variables())); } -JSValuePtr jsCSSVariablesRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCSSVariablesRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCSSVariablesRule*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSCSSVariablesRule::getConstructor(ExecState* exec) +JSValue JSCSSVariablesRule::getConstructor(ExecState* exec) { return getDOMConstructor<JSCSSVariablesRuleConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesRule.h b/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesRule.h index 2c318ff282..c204a1e2cf 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesRule.h @@ -31,23 +31,24 @@ class JSCSSVariablesRule : public JSCSSRule { typedef JSCSSRule Base; public: JSCSSVariablesRule(PassRefPtr<JSC::Structure>, PassRefPtr<CSSVariablesRule>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSCSSVariablesRulePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSCSSVariablesRulePrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -55,9 +56,9 @@ public: // Attributes -JSC::JSValuePtr jsCSSVariablesRuleMedia(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSVariablesRuleVariables(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCSSVariablesRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSVariablesRuleMedia(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSVariablesRuleVariables(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCSSVariablesRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCanvasGradient.cpp b/src/3rdparty/webkit/WebCore/generated/JSCanvasGradient.cpp index 69356d2d21..daf71ea50a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCanvasGradient.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCanvasGradient.cpp @@ -33,7 +33,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCanvasGradient) +ASSERT_CLASS_FITS_IN_CELL(JSCanvasGradient); /* Hash table for prototype */ @@ -52,9 +52,9 @@ static const HashTable JSCanvasGradientPrototypeTable = const ClassInfo JSCanvasGradientPrototype::s_info = { "CanvasGradientPrototype", 0, &JSCanvasGradientPrototypeTable, 0 }; -JSObject* JSCanvasGradientPrototype::self(ExecState* exec) +JSObject* JSCanvasGradientPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCanvasGradient>(exec); + return getDOMPrototype<JSCanvasGradient>(exec, globalObject); } bool JSCanvasGradientPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -73,36 +73,36 @@ JSCanvasGradient::JSCanvasGradient(PassRefPtr<Structure> structure, PassRefPtr<C JSCanvasGradient::~JSCanvasGradient() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSCanvasGradient::createPrototype(ExecState* exec) +JSObject* JSCanvasGradient::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCanvasGradientPrototype(JSCanvasGradientPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSCanvasGradientPrototype(JSCanvasGradientPrototype::createStructure(globalObject->objectPrototype())); } -JSValuePtr jsCanvasGradientPrototypeFunctionAddColorStop(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasGradientPrototypeFunctionAddColorStop(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasGradient::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasGradient::s_info)) return throwError(exec, TypeError); JSCanvasGradient* castedThisObj = static_cast<JSCanvasGradient*>(asObject(thisValue)); CanvasGradient* imp = static_cast<CanvasGradient*>(castedThisObj->impl()); ExceptionCode ec = 0; - float offset = args.at(exec, 0)->toFloat(exec); - const UString& color = args.at(exec, 1)->toString(exec); + float offset = args.at(0).toFloat(exec); + const UString& color = args.at(1).toString(exec); imp->addColorStop(offset, color, ec); setDOMException(exec, ec); return jsUndefined(); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, CanvasGradient* object) +JSC::JSValue toJS(JSC::ExecState* exec, CanvasGradient* object) { return getDOMObjectWrapper<JSCanvasGradient>(exec, object); } -CanvasGradient* toCanvasGradient(JSC::JSValuePtr value) +CanvasGradient* toCanvasGradient(JSC::JSValue value) { - return value->isObject(&JSCanvasGradient::s_info) ? static_cast<JSCanvasGradient*>(asObject(value))->impl() : 0; + return value.isObject(&JSCanvasGradient::s_info) ? static_cast<JSCanvasGradient*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCanvasGradient.h b/src/3rdparty/webkit/WebCore/generated/JSCanvasGradient.h index 0fc34b01a9..e81a3b44a0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCanvasGradient.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCanvasGradient.h @@ -34,7 +34,7 @@ class JSCanvasGradient : public DOMObject { public: JSCanvasGradient(PassRefPtr<JSC::Structure>, PassRefPtr<CanvasGradient>); virtual ~JSCanvasGradient(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -44,16 +44,17 @@ private: RefPtr<CanvasGradient> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, CanvasGradient*); -CanvasGradient* toCanvasGradient(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, CanvasGradient*); +CanvasGradient* toCanvasGradient(JSC::JSValue); class JSCanvasGradientPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -62,7 +63,7 @@ public: // Functions -JSC::JSValuePtr jsCanvasGradientPrototypeFunctionAddColorStop(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasGradientPrototypeFunctionAddColorStop(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCanvasPattern.cpp b/src/3rdparty/webkit/WebCore/generated/JSCanvasPattern.cpp index e14937f141..9b3ec21c70 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCanvasPattern.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCanvasPattern.cpp @@ -31,7 +31,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCanvasPattern) +ASSERT_CLASS_FITS_IN_CELL(JSCanvasPattern); /* Hash table for prototype */ @@ -49,9 +49,9 @@ static const HashTable JSCanvasPatternPrototypeTable = const ClassInfo JSCanvasPatternPrototype::s_info = { "CanvasPatternPrototype", 0, &JSCanvasPatternPrototypeTable, 0 }; -JSObject* JSCanvasPatternPrototype::self(ExecState* exec) +JSObject* JSCanvasPatternPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCanvasPattern>(exec); + return getDOMPrototype<JSCanvasPattern>(exec, globalObject); } const ClassInfo JSCanvasPattern::s_info = { "CanvasPattern", 0, 0, 0 }; @@ -65,21 +65,20 @@ JSCanvasPattern::JSCanvasPattern(PassRefPtr<Structure> structure, PassRefPtr<Can JSCanvasPattern::~JSCanvasPattern() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSCanvasPattern::createPrototype(ExecState* exec) +JSObject* JSCanvasPattern::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCanvasPatternPrototype(JSCanvasPatternPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSCanvasPatternPrototype(JSCanvasPatternPrototype::createStructure(globalObject->objectPrototype())); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, CanvasPattern* object) +JSC::JSValue toJS(JSC::ExecState* exec, CanvasPattern* object) { return getDOMObjectWrapper<JSCanvasPattern>(exec, object); } -CanvasPattern* toCanvasPattern(JSC::JSValuePtr value) +CanvasPattern* toCanvasPattern(JSC::JSValue value) { - return value->isObject(&JSCanvasPattern::s_info) ? static_cast<JSCanvasPattern*>(asObject(value))->impl() : 0; + return value.isObject(&JSCanvasPattern::s_info) ? static_cast<JSCanvasPattern*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCanvasPattern.h b/src/3rdparty/webkit/WebCore/generated/JSCanvasPattern.h index 1d691a240f..776b830694 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCanvasPattern.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCanvasPattern.h @@ -34,7 +34,7 @@ class JSCanvasPattern : public DOMObject { public: JSCanvasPattern(PassRefPtr<JSC::Structure>, PassRefPtr<CanvasPattern>); virtual ~JSCanvasPattern(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -44,12 +44,13 @@ private: RefPtr<CanvasPattern> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, CanvasPattern*); -CanvasPattern* toCanvasPattern(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, CanvasPattern*); +CanvasPattern* toCanvasPattern(JSC::JSValue); class JSCanvasPatternPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSCanvasPatternPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCanvasRenderingContext2D.cpp b/src/3rdparty/webkit/WebCore/generated/JSCanvasRenderingContext2D.cpp index 5148f6a5d5..9fb681d7a9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCanvasRenderingContext2D.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCanvasRenderingContext2D.cpp @@ -46,7 +46,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCanvasRenderingContext2D) +ASSERT_CLASS_FITS_IN_CELL(JSCanvasRenderingContext2D); /* Hash table */ @@ -98,13 +98,13 @@ public: JSCanvasRenderingContext2DConstructor(ExecState* exec) : DOMObject(JSCanvasRenderingContext2DConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCanvasRenderingContext2DPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCanvasRenderingContext2DPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -177,9 +177,9 @@ static const HashTable JSCanvasRenderingContext2DPrototypeTable = const ClassInfo JSCanvasRenderingContext2DPrototype::s_info = { "CanvasRenderingContext2DPrototype", 0, &JSCanvasRenderingContext2DPrototypeTable, 0 }; -JSObject* JSCanvasRenderingContext2DPrototype::self(ExecState* exec) +JSObject* JSCanvasRenderingContext2DPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCanvasRenderingContext2D>(exec); + return getDOMPrototype<JSCanvasRenderingContext2D>(exec, globalObject); } bool JSCanvasRenderingContext2DPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -198,12 +198,11 @@ JSCanvasRenderingContext2D::JSCanvasRenderingContext2D(PassRefPtr<Structure> str JSCanvasRenderingContext2D::~JSCanvasRenderingContext2D() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSCanvasRenderingContext2D::createPrototype(ExecState* exec) +JSObject* JSCanvasRenderingContext2D::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCanvasRenderingContext2DPrototype(JSCanvasRenderingContext2DPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSCanvasRenderingContext2DPrototype(JSCanvasRenderingContext2DPrototype::createStructure(globalObject->objectPrototype())); } bool JSCanvasRenderingContext2D::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -211,205 +210,220 @@ bool JSCanvasRenderingContext2D::getOwnPropertySlot(ExecState* exec, const Ident return getStaticValueSlot<JSCanvasRenderingContext2D, Base>(exec, &JSCanvasRenderingContext2DTable, this, propertyName, slot); } -JSValuePtr jsCanvasRenderingContext2DCanvas(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DCanvas(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->canvas())); } -JSValuePtr jsCanvasRenderingContext2DGlobalAlpha(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DGlobalAlpha(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->globalAlpha()); } -JSValuePtr jsCanvasRenderingContext2DGlobalCompositeOperation(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DGlobalCompositeOperation(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->globalCompositeOperation()); } -JSValuePtr jsCanvasRenderingContext2DLineWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DLineWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->lineWidth()); } -JSValuePtr jsCanvasRenderingContext2DLineCap(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DLineCap(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->lineCap()); } -JSValuePtr jsCanvasRenderingContext2DLineJoin(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DLineJoin(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->lineJoin()); } -JSValuePtr jsCanvasRenderingContext2DMiterLimit(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DMiterLimit(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->miterLimit()); } -JSValuePtr jsCanvasRenderingContext2DShadowOffsetX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DShadowOffsetX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->shadowOffsetX()); } -JSValuePtr jsCanvasRenderingContext2DShadowOffsetY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DShadowOffsetY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->shadowOffsetY()); } -JSValuePtr jsCanvasRenderingContext2DShadowBlur(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DShadowBlur(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->shadowBlur()); } -JSValuePtr jsCanvasRenderingContext2DShadowColor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DShadowColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->shadowColor()); } -JSValuePtr jsCanvasRenderingContext2DFont(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DFont(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->font()); } -JSValuePtr jsCanvasRenderingContext2DTextAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DTextAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->textAlign()); } -JSValuePtr jsCanvasRenderingContext2DTextBaseline(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DTextBaseline(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->textBaseline()); } -JSValuePtr jsCanvasRenderingContext2DStrokeStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DStrokeStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->strokeStyle(exec); } -JSValuePtr jsCanvasRenderingContext2DFillStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DFillStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->fillStyle(exec); } -JSValuePtr jsCanvasRenderingContext2DConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCanvasRenderingContext2DConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCanvasRenderingContext2D*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSCanvasRenderingContext2D::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSCanvasRenderingContext2D::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSCanvasRenderingContext2D, Base>(exec, propertyName, value, &JSCanvasRenderingContext2DTable, this, slot); } -void setJSCanvasRenderingContext2DGlobalAlpha(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCanvasRenderingContext2DGlobalAlpha(ExecState* exec, JSObject* thisObject, JSValue value) { CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(thisObject)->impl()); - imp->setGlobalAlpha(value->toFloat(exec)); + imp->setGlobalAlpha(value.toFloat(exec)); } -void setJSCanvasRenderingContext2DGlobalCompositeOperation(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCanvasRenderingContext2DGlobalCompositeOperation(ExecState* exec, JSObject* thisObject, JSValue value) { CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(thisObject)->impl()); imp->setGlobalCompositeOperation(valueToStringWithNullCheck(exec, value)); } -void setJSCanvasRenderingContext2DLineWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCanvasRenderingContext2DLineWidth(ExecState* exec, JSObject* thisObject, JSValue value) { CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(thisObject)->impl()); - imp->setLineWidth(value->toFloat(exec)); + imp->setLineWidth(value.toFloat(exec)); } -void setJSCanvasRenderingContext2DLineCap(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCanvasRenderingContext2DLineCap(ExecState* exec, JSObject* thisObject, JSValue value) { CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(thisObject)->impl()); imp->setLineCap(valueToStringWithNullCheck(exec, value)); } -void setJSCanvasRenderingContext2DLineJoin(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCanvasRenderingContext2DLineJoin(ExecState* exec, JSObject* thisObject, JSValue value) { CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(thisObject)->impl()); imp->setLineJoin(valueToStringWithNullCheck(exec, value)); } -void setJSCanvasRenderingContext2DMiterLimit(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCanvasRenderingContext2DMiterLimit(ExecState* exec, JSObject* thisObject, JSValue value) { CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(thisObject)->impl()); - imp->setMiterLimit(value->toFloat(exec)); + imp->setMiterLimit(value.toFloat(exec)); } -void setJSCanvasRenderingContext2DShadowOffsetX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCanvasRenderingContext2DShadowOffsetX(ExecState* exec, JSObject* thisObject, JSValue value) { CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(thisObject)->impl()); - imp->setShadowOffsetX(value->toFloat(exec)); + imp->setShadowOffsetX(value.toFloat(exec)); } -void setJSCanvasRenderingContext2DShadowOffsetY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCanvasRenderingContext2DShadowOffsetY(ExecState* exec, JSObject* thisObject, JSValue value) { CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(thisObject)->impl()); - imp->setShadowOffsetY(value->toFloat(exec)); + imp->setShadowOffsetY(value.toFloat(exec)); } -void setJSCanvasRenderingContext2DShadowBlur(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCanvasRenderingContext2DShadowBlur(ExecState* exec, JSObject* thisObject, JSValue value) { CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(thisObject)->impl()); - imp->setShadowBlur(value->toFloat(exec)); + imp->setShadowBlur(value.toFloat(exec)); } -void setJSCanvasRenderingContext2DShadowColor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCanvasRenderingContext2DShadowColor(ExecState* exec, JSObject* thisObject, JSValue value) { CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(thisObject)->impl()); imp->setShadowColor(valueToStringWithNullCheck(exec, value)); } -void setJSCanvasRenderingContext2DFont(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCanvasRenderingContext2DFont(ExecState* exec, JSObject* thisObject, JSValue value) { CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(thisObject)->impl()); - imp->setFont(value->toString(exec)); + imp->setFont(value.toString(exec)); } -void setJSCanvasRenderingContext2DTextAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCanvasRenderingContext2DTextAlign(ExecState* exec, JSObject* thisObject, JSValue value) { CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(thisObject)->impl()); - imp->setTextAlign(value->toString(exec)); + imp->setTextAlign(value.toString(exec)); } -void setJSCanvasRenderingContext2DTextBaseline(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCanvasRenderingContext2DTextBaseline(ExecState* exec, JSObject* thisObject, JSValue value) { CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(static_cast<JSCanvasRenderingContext2D*>(thisObject)->impl()); - imp->setTextBaseline(value->toString(exec)); + imp->setTextBaseline(value.toString(exec)); } -void setJSCanvasRenderingContext2DStrokeStyle(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCanvasRenderingContext2DStrokeStyle(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSCanvasRenderingContext2D*>(thisObject)->setStrokeStyle(exec, value); } -void setJSCanvasRenderingContext2DFillStyle(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCanvasRenderingContext2DFillStyle(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSCanvasRenderingContext2D*>(thisObject)->setFillStyle(exec, value); } -JSValuePtr JSCanvasRenderingContext2D::getConstructor(ExecState* exec) +JSValue JSCanvasRenderingContext2D::getConstructor(ExecState* exec) { return getDOMConstructor<JSCanvasRenderingContext2DConstructor>(exec); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSave(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSave(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); @@ -418,9 +432,10 @@ JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSave(ExecState* exec, JSOb return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionRestore(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionRestore(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); @@ -429,149 +444,159 @@ JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionRestore(ExecState* exec, J return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionScale(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionScale(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float sx = args.at(exec, 0)->toFloat(exec); - float sy = args.at(exec, 1)->toFloat(exec); + float sx = args.at(0).toFloat(exec); + float sy = args.at(1).toFloat(exec); imp->scale(sx, sy); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionRotate(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionRotate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float angle = args.at(exec, 0)->toFloat(exec); + float angle = args.at(0).toFloat(exec); imp->rotate(angle); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionTranslate(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionTranslate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float tx = args.at(exec, 0)->toFloat(exec); - float ty = args.at(exec, 1)->toFloat(exec); + float tx = args.at(0).toFloat(exec); + float ty = args.at(1).toFloat(exec); imp->translate(tx, ty); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionTransform(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionTransform(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float m11 = args.at(exec, 0)->toFloat(exec); - float m12 = args.at(exec, 1)->toFloat(exec); - float m21 = args.at(exec, 2)->toFloat(exec); - float m22 = args.at(exec, 3)->toFloat(exec); - float dx = args.at(exec, 4)->toFloat(exec); - float dy = args.at(exec, 5)->toFloat(exec); + float m11 = args.at(0).toFloat(exec); + float m12 = args.at(1).toFloat(exec); + float m21 = args.at(2).toFloat(exec); + float m22 = args.at(3).toFloat(exec); + float dx = args.at(4).toFloat(exec); + float dy = args.at(5).toFloat(exec); imp->transform(m11, m12, m21, m22, dx, dy); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetTransform(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetTransform(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float m11 = args.at(exec, 0)->toFloat(exec); - float m12 = args.at(exec, 1)->toFloat(exec); - float m21 = args.at(exec, 2)->toFloat(exec); - float m22 = args.at(exec, 3)->toFloat(exec); - float dx = args.at(exec, 4)->toFloat(exec); - float dy = args.at(exec, 5)->toFloat(exec); + float m11 = args.at(0).toFloat(exec); + float m12 = args.at(1).toFloat(exec); + float m21 = args.at(2).toFloat(exec); + float m22 = args.at(3).toFloat(exec); + float dx = args.at(4).toFloat(exec); + float dy = args.at(5).toFloat(exec); imp->setTransform(m11, m12, m21, m22, dx, dy); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionCreateLinearGradient(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionCreateLinearGradient(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); ExceptionCode ec = 0; - float x0 = args.at(exec, 0)->toFloat(exec); - float y0 = args.at(exec, 1)->toFloat(exec); - float x1 = args.at(exec, 2)->toFloat(exec); - float y1 = args.at(exec, 3)->toFloat(exec); + float x0 = args.at(0).toFloat(exec); + float y0 = args.at(1).toFloat(exec); + float x1 = args.at(2).toFloat(exec); + float y1 = args.at(3).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createLinearGradient(x0, y0, x1, y1, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createLinearGradient(x0, y0, x1, y1, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionCreateRadialGradient(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionCreateRadialGradient(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); ExceptionCode ec = 0; - float x0 = args.at(exec, 0)->toFloat(exec); - float y0 = args.at(exec, 1)->toFloat(exec); - float r0 = args.at(exec, 2)->toFloat(exec); - float x1 = args.at(exec, 3)->toFloat(exec); - float y1 = args.at(exec, 4)->toFloat(exec); - float r1 = args.at(exec, 5)->toFloat(exec); + float x0 = args.at(0).toFloat(exec); + float y0 = args.at(1).toFloat(exec); + float r0 = args.at(2).toFloat(exec); + float x1 = args.at(3).toFloat(exec); + float y1 = args.at(4).toFloat(exec); + float r1 = args.at(5).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createRadialGradient(x0, y0, r0, x1, y1, r1, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createRadialGradient(x0, y0, r0, x1, y1, r1, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionClearRect(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionClearRect(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); - float width = args.at(exec, 2)->toFloat(exec); - float height = args.at(exec, 3)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); + float width = args.at(2).toFloat(exec); + float height = args.at(3).toFloat(exec); imp->clearRect(x, y, width, height); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionFillRect(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionFillRect(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); - float width = args.at(exec, 2)->toFloat(exec); - float height = args.at(exec, 3)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); + float width = args.at(2).toFloat(exec); + float height = args.at(3).toFloat(exec); imp->fillRect(x, y, width, height); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionBeginPath(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionBeginPath(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); @@ -580,9 +605,10 @@ JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionBeginPath(ExecState* exec, return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionClosePath(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionClosePath(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); @@ -591,119 +617,127 @@ JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionClosePath(ExecState* exec, return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionMoveTo(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionMoveTo(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); imp->moveTo(x, y); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionLineTo(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionLineTo(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); imp->lineTo(x, y); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionQuadraticCurveTo(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionQuadraticCurveTo(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float cpx = args.at(exec, 0)->toFloat(exec); - float cpy = args.at(exec, 1)->toFloat(exec); - float x = args.at(exec, 2)->toFloat(exec); - float y = args.at(exec, 3)->toFloat(exec); + float cpx = args.at(0).toFloat(exec); + float cpy = args.at(1).toFloat(exec); + float x = args.at(2).toFloat(exec); + float y = args.at(3).toFloat(exec); imp->quadraticCurveTo(cpx, cpy, x, y); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionBezierCurveTo(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionBezierCurveTo(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float cp1x = args.at(exec, 0)->toFloat(exec); - float cp1y = args.at(exec, 1)->toFloat(exec); - float cp2x = args.at(exec, 2)->toFloat(exec); - float cp2y = args.at(exec, 3)->toFloat(exec); - float x = args.at(exec, 4)->toFloat(exec); - float y = args.at(exec, 5)->toFloat(exec); + float cp1x = args.at(0).toFloat(exec); + float cp1y = args.at(1).toFloat(exec); + float cp2x = args.at(2).toFloat(exec); + float cp2y = args.at(3).toFloat(exec); + float x = args.at(4).toFloat(exec); + float y = args.at(5).toFloat(exec); imp->bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionArcTo(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionArcTo(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); ExceptionCode ec = 0; - float x1 = args.at(exec, 0)->toFloat(exec); - float y1 = args.at(exec, 1)->toFloat(exec); - float x2 = args.at(exec, 2)->toFloat(exec); - float y2 = args.at(exec, 3)->toFloat(exec); - float radius = args.at(exec, 4)->toFloat(exec); + float x1 = args.at(0).toFloat(exec); + float y1 = args.at(1).toFloat(exec); + float x2 = args.at(2).toFloat(exec); + float y2 = args.at(3).toFloat(exec); + float radius = args.at(4).toFloat(exec); imp->arcTo(x1, y1, x2, y2, radius, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionRect(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionRect(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); - float width = args.at(exec, 2)->toFloat(exec); - float height = args.at(exec, 3)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); + float width = args.at(2).toFloat(exec); + float height = args.at(3).toFloat(exec); imp->rect(x, y, width, height); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionArc(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionArc(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); ExceptionCode ec = 0; - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); - float radius = args.at(exec, 2)->toFloat(exec); - float startAngle = args.at(exec, 3)->toFloat(exec); - float endAngle = args.at(exec, 4)->toFloat(exec); - bool anticlockwise = args.at(exec, 5)->toBoolean(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); + float radius = args.at(2).toFloat(exec); + float startAngle = args.at(3).toFloat(exec); + float endAngle = args.at(4).toFloat(exec); + bool anticlockwise = args.at(5).toBoolean(exec); imp->arc(x, y, radius, startAngle, endAngle, anticlockwise, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionFill(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionFill(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); @@ -712,9 +746,10 @@ JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionFill(ExecState* exec, JSOb return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionStroke(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionStroke(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); @@ -723,9 +758,10 @@ JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionStroke(ExecState* exec, JS return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionClip(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionClip(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); @@ -734,124 +770,135 @@ JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionClip(ExecState* exec, JSOb return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionIsPointInPath(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionIsPointInPath(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); - JSC::JSValuePtr result = jsBoolean(imp->isPointInPath(x, y)); + JSC::JSValue result = jsBoolean(imp->isPointInPath(x, y)); return result; } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionFillText(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionFillText(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); return castedThisObj->fillText(exec, args); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionStrokeText(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionStrokeText(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); return castedThisObj->strokeText(exec, args); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionMeasureText(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionMeasureText(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - const UString& text = args.at(exec, 0)->toString(exec); + const UString& text = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->measureText(text))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->measureText(text))); return result; } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetAlpha(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetAlpha(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float alpha = args.at(exec, 0)->toFloat(exec); + float alpha = args.at(0).toFloat(exec); imp->setAlpha(alpha); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetCompositeOperation(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetCompositeOperation(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - const UString& compositeOperation = args.at(exec, 0)->toString(exec); + const UString& compositeOperation = args.at(0).toString(exec); imp->setCompositeOperation(compositeOperation); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetLineWidth(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetLineWidth(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float width = args.at(exec, 0)->toFloat(exec); + float width = args.at(0).toFloat(exec); imp->setLineWidth(width); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetLineCap(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetLineCap(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - const UString& cap = args.at(exec, 0)->toString(exec); + const UString& cap = args.at(0).toString(exec); imp->setLineCap(cap); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetLineJoin(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetLineJoin(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - const UString& join = args.at(exec, 0)->toString(exec); + const UString& join = args.at(0).toString(exec); imp->setLineJoin(join); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetMiterLimit(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetMiterLimit(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float limit = args.at(exec, 0)->toFloat(exec); + float limit = args.at(0).toFloat(exec); imp->setMiterLimit(limit); return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionClearShadow(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionClearShadow(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); @@ -860,109 +907,119 @@ JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionClearShadow(ExecState* exe return jsUndefined(); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetStrokeColor(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetStrokeColor(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); return castedThisObj->setStrokeColor(exec, args); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetFillColor(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetFillColor(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); return castedThisObj->setFillColor(exec, args); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionStrokeRect(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionStrokeRect(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); return castedThisObj->strokeRect(exec, args); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionDrawImage(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionDrawImage(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); return castedThisObj->drawImage(exec, args); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionDrawImageFromRect(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionDrawImageFromRect(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); return castedThisObj->drawImageFromRect(exec, args); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetShadow(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetShadow(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); return castedThisObj->setShadow(exec, args); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionCreatePattern(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionCreatePattern(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); return castedThisObj->createPattern(exec, args); } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionCreateImageData(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionCreateImageData(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); - float sw = args.at(exec, 0)->toFloat(exec); - float sh = args.at(exec, 1)->toFloat(exec); + float sw = args.at(0).toFloat(exec); + float sh = args.at(1).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createImageData(sw, sh))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createImageData(sw, sh))); return result; } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionGetImageData(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionGetImageData(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); CanvasRenderingContext2D* imp = static_cast<CanvasRenderingContext2D*>(castedThisObj->impl()); ExceptionCode ec = 0; - float sx = args.at(exec, 0)->toFloat(exec); - float sy = args.at(exec, 1)->toFloat(exec); - float sw = args.at(exec, 2)->toFloat(exec); - float sh = args.at(exec, 3)->toFloat(exec); + float sx = args.at(0).toFloat(exec); + float sy = args.at(1).toFloat(exec); + float sw = args.at(2).toFloat(exec); + float sh = args.at(3).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getImageData(sx, sy, sw, sh, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getImageData(sx, sy, sw, sh, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionPutImageData(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionPutImageData(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCanvasRenderingContext2D::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCanvasRenderingContext2D::s_info)) return throwError(exec, TypeError); JSCanvasRenderingContext2D* castedThisObj = static_cast<JSCanvasRenderingContext2D*>(asObject(thisValue)); return castedThisObj->putImageData(exec, args); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, CanvasRenderingContext2D* object) +JSC::JSValue toJS(JSC::ExecState* exec, CanvasRenderingContext2D* object) { return getDOMObjectWrapper<JSCanvasRenderingContext2D>(exec, object); } -CanvasRenderingContext2D* toCanvasRenderingContext2D(JSC::JSValuePtr value) +CanvasRenderingContext2D* toCanvasRenderingContext2D(JSC::JSValue value) { - return value->isObject(&JSCanvasRenderingContext2D::s_info) ? static_cast<JSCanvasRenderingContext2D*>(asObject(value))->impl() : 0; + return value.isObject(&JSCanvasRenderingContext2D::s_info) ? static_cast<JSCanvasRenderingContext2D*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCanvasRenderingContext2D.h b/src/3rdparty/webkit/WebCore/generated/JSCanvasRenderingContext2D.h index ace29c8226..6c084d1a6c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCanvasRenderingContext2D.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCanvasRenderingContext2D.h @@ -34,52 +34,53 @@ class JSCanvasRenderingContext2D : public DOMObject { public: JSCanvasRenderingContext2D(PassRefPtr<JSC::Structure>, PassRefPtr<CanvasRenderingContext2D>); virtual ~JSCanvasRenderingContext2D(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom attributes - JSC::JSValuePtr strokeStyle(JSC::ExecState*) const; - void setStrokeStyle(JSC::ExecState*, JSC::JSValuePtr); - JSC::JSValuePtr fillStyle(JSC::ExecState*) const; - void setFillStyle(JSC::ExecState*, JSC::JSValuePtr); + JSC::JSValue strokeStyle(JSC::ExecState*) const; + void setStrokeStyle(JSC::ExecState*, JSC::JSValue); + JSC::JSValue fillStyle(JSC::ExecState*) const; + void setFillStyle(JSC::ExecState*, JSC::JSValue); // Custom functions - JSC::JSValuePtr fillText(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr strokeText(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr setStrokeColor(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr setFillColor(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr strokeRect(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr drawImage(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr drawImageFromRect(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr setShadow(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr createPattern(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr putImageData(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue fillText(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue strokeText(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setStrokeColor(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setFillColor(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue strokeRect(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue drawImage(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue drawImageFromRect(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setShadow(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue createPattern(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue putImageData(JSC::ExecState*, const JSC::ArgList&); CanvasRenderingContext2D* impl() const { return m_impl.get(); } private: RefPtr<CanvasRenderingContext2D> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, CanvasRenderingContext2D*); -CanvasRenderingContext2D* toCanvasRenderingContext2D(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, CanvasRenderingContext2D*); +CanvasRenderingContext2D* toCanvasRenderingContext2D(JSC::JSValue); class JSCanvasRenderingContext2DPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -88,84 +89,84 @@ public: // Functions -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSave(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionRestore(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionScale(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionRotate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionTranslate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionTransform(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetTransform(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionCreateLinearGradient(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionCreateRadialGradient(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionClearRect(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionFillRect(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionBeginPath(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionClosePath(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionMoveTo(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionLineTo(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionQuadraticCurveTo(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionBezierCurveTo(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionArcTo(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionRect(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionArc(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionFill(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionStroke(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionClip(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionIsPointInPath(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionFillText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionStrokeText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionMeasureText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetAlpha(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetCompositeOperation(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetLineWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetLineCap(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetLineJoin(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetMiterLimit(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionClearShadow(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetStrokeColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetFillColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionStrokeRect(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionDrawImage(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionDrawImageFromRect(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionSetShadow(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionCreatePattern(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionCreateImageData(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionGetImageData(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCanvasRenderingContext2DPrototypeFunctionPutImageData(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSave(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionRestore(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionScale(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionRotate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionTranslate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionTransform(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetTransform(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionCreateLinearGradient(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionCreateRadialGradient(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionClearRect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionFillRect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionBeginPath(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionClosePath(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionMoveTo(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionLineTo(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionQuadraticCurveTo(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionBezierCurveTo(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionArcTo(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionRect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionArc(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionFill(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionStroke(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionClip(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionIsPointInPath(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionFillText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionStrokeText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionMeasureText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetAlpha(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetCompositeOperation(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetLineWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetLineCap(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetLineJoin(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetMiterLimit(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionClearShadow(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetStrokeColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetFillColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionStrokeRect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionDrawImage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionDrawImageFromRect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSetShadow(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionCreatePattern(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionCreateImageData(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionGetImageData(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionPutImageData(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsCanvasRenderingContext2DCanvas(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCanvasRenderingContext2DGlobalAlpha(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCanvasRenderingContext2DGlobalAlpha(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCanvasRenderingContext2DGlobalCompositeOperation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCanvasRenderingContext2DGlobalCompositeOperation(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCanvasRenderingContext2DLineWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCanvasRenderingContext2DLineWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCanvasRenderingContext2DLineCap(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCanvasRenderingContext2DLineCap(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCanvasRenderingContext2DLineJoin(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCanvasRenderingContext2DLineJoin(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCanvasRenderingContext2DMiterLimit(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCanvasRenderingContext2DMiterLimit(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCanvasRenderingContext2DShadowOffsetX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCanvasRenderingContext2DShadowOffsetX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCanvasRenderingContext2DShadowOffsetY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCanvasRenderingContext2DShadowOffsetY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCanvasRenderingContext2DShadowBlur(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCanvasRenderingContext2DShadowBlur(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCanvasRenderingContext2DShadowColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCanvasRenderingContext2DShadowColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCanvasRenderingContext2DFont(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCanvasRenderingContext2DFont(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCanvasRenderingContext2DTextAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCanvasRenderingContext2DTextAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCanvasRenderingContext2DTextBaseline(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCanvasRenderingContext2DTextBaseline(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCanvasRenderingContext2DStrokeStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCanvasRenderingContext2DStrokeStyle(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCanvasRenderingContext2DFillStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCanvasRenderingContext2DFillStyle(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCanvasRenderingContext2DConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCanvasRenderingContext2DCanvas(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCanvasRenderingContext2DGlobalAlpha(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCanvasRenderingContext2DGlobalAlpha(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCanvasRenderingContext2DGlobalCompositeOperation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCanvasRenderingContext2DGlobalCompositeOperation(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCanvasRenderingContext2DLineWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCanvasRenderingContext2DLineWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCanvasRenderingContext2DLineCap(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCanvasRenderingContext2DLineCap(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCanvasRenderingContext2DLineJoin(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCanvasRenderingContext2DLineJoin(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCanvasRenderingContext2DMiterLimit(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCanvasRenderingContext2DMiterLimit(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCanvasRenderingContext2DShadowOffsetX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCanvasRenderingContext2DShadowOffsetX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCanvasRenderingContext2DShadowOffsetY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCanvasRenderingContext2DShadowOffsetY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCanvasRenderingContext2DShadowBlur(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCanvasRenderingContext2DShadowBlur(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCanvasRenderingContext2DShadowColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCanvasRenderingContext2DShadowColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCanvasRenderingContext2DFont(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCanvasRenderingContext2DFont(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCanvasRenderingContext2DTextAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCanvasRenderingContext2DTextAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCanvasRenderingContext2DTextBaseline(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCanvasRenderingContext2DTextBaseline(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCanvasRenderingContext2DStrokeStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCanvasRenderingContext2DStrokeStyle(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCanvasRenderingContext2DFillStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCanvasRenderingContext2DFillStyle(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCanvasRenderingContext2DConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCharacterData.cpp b/src/3rdparty/webkit/WebCore/generated/JSCharacterData.cpp index ba59a0cd9f..4e5d2dba7a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCharacterData.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCharacterData.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCharacterData) +ASSERT_CLASS_FITS_IN_CELL(JSCharacterData); /* Hash table */ @@ -74,13 +74,13 @@ public: JSCharacterDataConstructor(ExecState* exec) : DOMObject(JSCharacterDataConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCharacterDataPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCharacterDataPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -114,9 +114,9 @@ static const HashTable JSCharacterDataPrototypeTable = const ClassInfo JSCharacterDataPrototype::s_info = { "CharacterDataPrototype", 0, &JSCharacterDataPrototypeTable, 0 }; -JSObject* JSCharacterDataPrototype::self(ExecState* exec) +JSObject* JSCharacterDataPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCharacterData>(exec); + return getDOMPrototype<JSCharacterData>(exec, globalObject); } bool JSCharacterDataPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -124,16 +124,16 @@ bool JSCharacterDataPrototype::getOwnPropertySlot(ExecState* exec, const Identif return getStaticFunctionSlot<JSObject>(exec, &JSCharacterDataPrototypeTable, this, propertyName, slot); } -const ClassInfo JSCharacterData::s_info = { "CharacterData", &JSEventTargetNode::s_info, &JSCharacterDataTable, 0 }; +const ClassInfo JSCharacterData::s_info = { "CharacterData", &JSNode::s_info, &JSCharacterDataTable, 0 }; JSCharacterData::JSCharacterData(PassRefPtr<Structure> structure, PassRefPtr<CharacterData> impl) - : JSEventTargetNode(structure, impl) + : JSNode(structure, impl) { } -JSObject* JSCharacterData::createPrototype(ExecState* exec) +JSObject* JSCharacterData::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCharacterDataPrototype(JSCharacterDataPrototype::createStructure(JSEventTargetNodePrototype::self(exec))); + return new (exec) JSCharacterDataPrototype(JSCharacterDataPrototype::createStructure(JSNodePrototype::self(exec, globalObject))); } bool JSCharacterData::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -141,28 +141,30 @@ bool JSCharacterData::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSCharacterData, Base>(exec, &JSCharacterDataTable, this, propertyName, slot); } -JSValuePtr jsCharacterDataData(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCharacterDataData(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CharacterData* imp = static_cast<CharacterData*>(static_cast<JSCharacterData*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->data()); } -JSValuePtr jsCharacterDataLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCharacterDataLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); CharacterData* imp = static_cast<CharacterData*>(static_cast<JSCharacterData*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsCharacterDataConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCharacterDataConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCharacterData*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSCharacterData::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSCharacterData::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSCharacterData, Base>(exec, propertyName, value, &JSCharacterDataTable, this, slot); } -void setJSCharacterDataData(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSCharacterDataData(ExecState* exec, JSObject* thisObject, JSValue value) { CharacterData* imp = static_cast<CharacterData*>(static_cast<JSCharacterData*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -170,81 +172,85 @@ void setJSCharacterDataData(ExecState* exec, JSObject* thisObject, JSValuePtr va setDOMException(exec, ec); } -JSValuePtr JSCharacterData::getConstructor(ExecState* exec) +JSValue JSCharacterData::getConstructor(ExecState* exec) { return getDOMConstructor<JSCharacterDataConstructor>(exec); } -JSValuePtr jsCharacterDataPrototypeFunctionSubstringData(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCharacterDataPrototypeFunctionSubstringData(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCharacterData::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCharacterData::s_info)) return throwError(exec, TypeError); JSCharacterData* castedThisObj = static_cast<JSCharacterData*>(asObject(thisValue)); CharacterData* imp = static_cast<CharacterData*>(castedThisObj->impl()); ExceptionCode ec = 0; - int offset = args.at(exec, 0)->toInt32(exec); + int offset = args.at(0).toInt32(exec); if (offset < 0) { setDOMException(exec, INDEX_SIZE_ERR); return jsUndefined(); } - int length = args.at(exec, 1)->toInt32(exec); + int length = args.at(1).toInt32(exec); if (length < 0) { setDOMException(exec, INDEX_SIZE_ERR); return jsUndefined(); } - JSC::JSValuePtr result = jsStringOrNull(exec, imp->substringData(offset, length, ec)); + JSC::JSValue result = jsStringOrNull(exec, imp->substringData(offset, length, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsCharacterDataPrototypeFunctionAppendData(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCharacterDataPrototypeFunctionAppendData(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCharacterData::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCharacterData::s_info)) return throwError(exec, TypeError); JSCharacterData* castedThisObj = static_cast<JSCharacterData*>(asObject(thisValue)); CharacterData* imp = static_cast<CharacterData*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& data = args.at(exec, 0)->toString(exec); + const UString& data = args.at(0).toString(exec); imp->appendData(data, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsCharacterDataPrototypeFunctionInsertData(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCharacterDataPrototypeFunctionInsertData(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCharacterData::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCharacterData::s_info)) return throwError(exec, TypeError); JSCharacterData* castedThisObj = static_cast<JSCharacterData*>(asObject(thisValue)); CharacterData* imp = static_cast<CharacterData*>(castedThisObj->impl()); ExceptionCode ec = 0; - int offset = args.at(exec, 0)->toInt32(exec); + int offset = args.at(0).toInt32(exec); if (offset < 0) { setDOMException(exec, INDEX_SIZE_ERR); return jsUndefined(); } - const UString& data = args.at(exec, 1)->toString(exec); + const UString& data = args.at(1).toString(exec); imp->insertData(offset, data, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsCharacterDataPrototypeFunctionDeleteData(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCharacterDataPrototypeFunctionDeleteData(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCharacterData::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCharacterData::s_info)) return throwError(exec, TypeError); JSCharacterData* castedThisObj = static_cast<JSCharacterData*>(asObject(thisValue)); CharacterData* imp = static_cast<CharacterData*>(castedThisObj->impl()); ExceptionCode ec = 0; - int offset = args.at(exec, 0)->toInt32(exec); + int offset = args.at(0).toInt32(exec); if (offset < 0) { setDOMException(exec, INDEX_SIZE_ERR); return jsUndefined(); } - int length = args.at(exec, 1)->toInt32(exec); + int length = args.at(1).toInt32(exec); if (length < 0) { setDOMException(exec, INDEX_SIZE_ERR); return jsUndefined(); @@ -255,24 +261,25 @@ JSValuePtr jsCharacterDataPrototypeFunctionDeleteData(ExecState* exec, JSObject* return jsUndefined(); } -JSValuePtr jsCharacterDataPrototypeFunctionReplaceData(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsCharacterDataPrototypeFunctionReplaceData(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSCharacterData::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCharacterData::s_info)) return throwError(exec, TypeError); JSCharacterData* castedThisObj = static_cast<JSCharacterData*>(asObject(thisValue)); CharacterData* imp = static_cast<CharacterData*>(castedThisObj->impl()); ExceptionCode ec = 0; - int offset = args.at(exec, 0)->toInt32(exec); + int offset = args.at(0).toInt32(exec); if (offset < 0) { setDOMException(exec, INDEX_SIZE_ERR); return jsUndefined(); } - int length = args.at(exec, 1)->toInt32(exec); + int length = args.at(1).toInt32(exec); if (length < 0) { setDOMException(exec, INDEX_SIZE_ERR); return jsUndefined(); } - const UString& data = args.at(exec, 2)->toString(exec); + const UString& data = args.at(2).toString(exec); imp->replaceData(offset, length, data, ec); setDOMException(exec, ec); diff --git a/src/3rdparty/webkit/WebCore/generated/JSCharacterData.h b/src/3rdparty/webkit/WebCore/generated/JSCharacterData.h index 4aad7155c4..273318f6f3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCharacterData.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCharacterData.h @@ -21,38 +21,39 @@ #ifndef JSCharacterData_h #define JSCharacterData_h -#include "JSEventTargetNode.h" +#include "JSNode.h" namespace WebCore { class CharacterData; -class JSCharacterData : public JSEventTargetNode { - typedef JSEventTargetNode Base; +class JSCharacterData : public JSNode { + typedef JSNode Base; public: JSCharacterData(PassRefPtr<JSC::Structure>, PassRefPtr<CharacterData>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSCharacterDataPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -61,17 +62,17 @@ public: // Functions -JSC::JSValuePtr jsCharacterDataPrototypeFunctionSubstringData(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCharacterDataPrototypeFunctionAppendData(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCharacterDataPrototypeFunctionInsertData(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCharacterDataPrototypeFunctionDeleteData(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsCharacterDataPrototypeFunctionReplaceData(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCharacterDataPrototypeFunctionSubstringData(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCharacterDataPrototypeFunctionAppendData(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCharacterDataPrototypeFunctionInsertData(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCharacterDataPrototypeFunctionDeleteData(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsCharacterDataPrototypeFunctionReplaceData(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsCharacterDataData(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSCharacterDataData(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsCharacterDataLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCharacterDataConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCharacterDataData(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSCharacterDataData(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsCharacterDataLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCharacterDataConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSClientRect.cpp b/src/3rdparty/webkit/WebCore/generated/JSClientRect.cpp new file mode 100644 index 0000000000..8aa1b8eff9 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSClientRect.cpp @@ -0,0 +1,200 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "config.h" + +#include "JSClientRect.h" + +#include <wtf/GetPtr.h> + +#include "ClientRect.h" + +#include <runtime/JSNumberCell.h> + +using namespace JSC; + +namespace WebCore { + +ASSERT_CLASS_FITS_IN_CELL(JSClientRect); + +/* Hash table */ + +static const HashTableValue JSClientRectTableValues[8] = +{ + { "top", DontDelete|ReadOnly, (intptr_t)jsClientRectTop, (intptr_t)0 }, + { "right", DontDelete|ReadOnly, (intptr_t)jsClientRectRight, (intptr_t)0 }, + { "bottom", DontDelete|ReadOnly, (intptr_t)jsClientRectBottom, (intptr_t)0 }, + { "left", DontDelete|ReadOnly, (intptr_t)jsClientRectLeft, (intptr_t)0 }, + { "width", DontDelete|ReadOnly, (intptr_t)jsClientRectWidth, (intptr_t)0 }, + { "height", DontDelete|ReadOnly, (intptr_t)jsClientRectHeight, (intptr_t)0 }, + { "constructor", DontEnum|ReadOnly, (intptr_t)jsClientRectConstructor, (intptr_t)0 }, + { 0, 0, 0, 0 } +}; + +static const HashTable JSClientRectTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 255, JSClientRectTableValues, 0 }; +#else + { 18, 15, JSClientRectTableValues, 0 }; +#endif + +/* Hash table for constructor */ + +static const HashTableValue JSClientRectConstructorTableValues[1] = +{ + { 0, 0, 0, 0 } +}; + +static const HashTable JSClientRectConstructorTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSClientRectConstructorTableValues, 0 }; +#else + { 1, 0, JSClientRectConstructorTableValues, 0 }; +#endif + +class JSClientRectConstructor : public DOMObject { +public: + JSClientRectConstructor(ExecState* exec) + : DOMObject(JSClientRectConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + { + putDirect(exec->propertyNames().prototype, JSClientRectPrototype::self(exec, exec->lexicalGlobalObject()), None); + } + virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); + virtual const ClassInfo* classInfo() const { return &s_info; } + static const ClassInfo s_info; + + static PassRefPtr<Structure> createStructure(JSValue proto) + { + return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); + } +}; + +const ClassInfo JSClientRectConstructor::s_info = { "ClientRectConstructor", 0, &JSClientRectConstructorTable, 0 }; + +bool JSClientRectConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot<JSClientRectConstructor, DOMObject>(exec, &JSClientRectConstructorTable, this, propertyName, slot); +} + +/* Hash table for prototype */ + +static const HashTableValue JSClientRectPrototypeTableValues[1] = +{ + { 0, 0, 0, 0 } +}; + +static const HashTable JSClientRectPrototypeTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSClientRectPrototypeTableValues, 0 }; +#else + { 1, 0, JSClientRectPrototypeTableValues, 0 }; +#endif + +const ClassInfo JSClientRectPrototype::s_info = { "ClientRectPrototype", 0, &JSClientRectPrototypeTable, 0 }; + +JSObject* JSClientRectPrototype::self(ExecState* exec, JSGlobalObject* globalObject) +{ + return getDOMPrototype<JSClientRect>(exec, globalObject); +} + +const ClassInfo JSClientRect::s_info = { "ClientRect", 0, &JSClientRectTable, 0 }; + +JSClientRect::JSClientRect(PassRefPtr<Structure> structure, PassRefPtr<ClientRect> impl) + : DOMObject(structure) + , m_impl(impl) +{ +} + +JSClientRect::~JSClientRect() +{ + forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); +} + +JSObject* JSClientRect::createPrototype(ExecState* exec, JSGlobalObject* globalObject) +{ + return new (exec) JSClientRectPrototype(JSClientRectPrototype::createStructure(globalObject->objectPrototype())); +} + +bool JSClientRect::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot<JSClientRect, Base>(exec, &JSClientRectTable, this, propertyName, slot); +} + +JSValue jsClientRectTop(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + ClientRect* imp = static_cast<ClientRect*>(static_cast<JSClientRect*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->top()); +} + +JSValue jsClientRectRight(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + ClientRect* imp = static_cast<ClientRect*>(static_cast<JSClientRect*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->right()); +} + +JSValue jsClientRectBottom(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + ClientRect* imp = static_cast<ClientRect*>(static_cast<JSClientRect*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->bottom()); +} + +JSValue jsClientRectLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + ClientRect* imp = static_cast<ClientRect*>(static_cast<JSClientRect*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->left()); +} + +JSValue jsClientRectWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + ClientRect* imp = static_cast<ClientRect*>(static_cast<JSClientRect*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->width()); +} + +JSValue jsClientRectHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + ClientRect* imp = static_cast<ClientRect*>(static_cast<JSClientRect*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->height()); +} + +JSValue jsClientRectConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + return static_cast<JSClientRect*>(asObject(slot.slotBase()))->getConstructor(exec); +} +JSValue JSClientRect::getConstructor(ExecState* exec) +{ + return getDOMConstructor<JSClientRectConstructor>(exec); +} + +JSC::JSValue toJS(JSC::ExecState* exec, ClientRect* object) +{ + return getDOMObjectWrapper<JSClientRect>(exec, object); +} +ClientRect* toClientRect(JSC::JSValue value) +{ + return value.isObject(&JSClientRect::s_info) ? static_cast<JSClientRect*>(asObject(value))->impl() : 0; +} + +} diff --git a/src/3rdparty/webkit/WebCore/generated/JSClientRect.h b/src/3rdparty/webkit/WebCore/generated/JSClientRect.h new file mode 100644 index 0000000000..13a7b3812e --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSClientRect.h @@ -0,0 +1,78 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef JSClientRect_h +#define JSClientRect_h + +#include "JSDOMBinding.h" +#include <runtime/JSGlobalObject.h> +#include <runtime/ObjectPrototype.h> + +namespace WebCore { + +class ClientRect; + +class JSClientRect : public DOMObject { + typedef DOMObject Base; +public: + JSClientRect(PassRefPtr<JSC::Structure>, PassRefPtr<ClientRect>); + virtual ~JSClientRect(); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + + static JSC::JSValue getConstructor(JSC::ExecState*); + ClientRect* impl() const { return m_impl.get(); } + +private: + RefPtr<ClientRect> m_impl; +}; + +JSC::JSValue toJS(JSC::ExecState*, ClientRect*); +ClientRect* toClientRect(JSC::JSValue); + +class JSClientRectPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; +public: + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + JSClientRectPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } +}; + +// Attributes + +JSC::JSValue jsClientRectTop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsClientRectRight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsClientRectBottom(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsClientRectLeft(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsClientRectWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsClientRectHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsClientRectConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + +} // namespace WebCore + +#endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSClientRectList.cpp b/src/3rdparty/webkit/WebCore/generated/JSClientRectList.cpp new file mode 100644 index 0000000000..e1316b7670 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSClientRectList.cpp @@ -0,0 +1,222 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "config.h" + +#include "JSClientRectList.h" + +#include <wtf/GetPtr.h> + +#include <runtime/PropertyNameArray.h> +#include "ClientRect.h" +#include "ClientRectList.h" +#include "ExceptionCode.h" +#include "JSClientRect.h" + +#include <runtime/Error.h> +#include <runtime/JSNumberCell.h> + +using namespace JSC; + +namespace WebCore { + +ASSERT_CLASS_FITS_IN_CELL(JSClientRectList); + +/* Hash table */ + +static const HashTableValue JSClientRectListTableValues[3] = +{ + { "length", DontDelete|ReadOnly, (intptr_t)jsClientRectListLength, (intptr_t)0 }, + { "constructor", DontEnum|ReadOnly, (intptr_t)jsClientRectListConstructor, (intptr_t)0 }, + { 0, 0, 0, 0 } +}; + +static const HashTable JSClientRectListTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 15, JSClientRectListTableValues, 0 }; +#else + { 5, 3, JSClientRectListTableValues, 0 }; +#endif + +/* Hash table for constructor */ + +static const HashTableValue JSClientRectListConstructorTableValues[1] = +{ + { 0, 0, 0, 0 } +}; + +static const HashTable JSClientRectListConstructorTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSClientRectListConstructorTableValues, 0 }; +#else + { 1, 0, JSClientRectListConstructorTableValues, 0 }; +#endif + +class JSClientRectListConstructor : public DOMObject { +public: + JSClientRectListConstructor(ExecState* exec) + : DOMObject(JSClientRectListConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + { + putDirect(exec->propertyNames().prototype, JSClientRectListPrototype::self(exec, exec->lexicalGlobalObject()), None); + } + virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); + virtual const ClassInfo* classInfo() const { return &s_info; } + static const ClassInfo s_info; + + static PassRefPtr<Structure> createStructure(JSValue proto) + { + return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); + } +}; + +const ClassInfo JSClientRectListConstructor::s_info = { "ClientRectListConstructor", 0, &JSClientRectListConstructorTable, 0 }; + +bool JSClientRectListConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot<JSClientRectListConstructor, DOMObject>(exec, &JSClientRectListConstructorTable, this, propertyName, slot); +} + +/* Hash table for prototype */ + +static const HashTableValue JSClientRectListPrototypeTableValues[2] = +{ + { "item", DontDelete|Function, (intptr_t)jsClientRectListPrototypeFunctionItem, (intptr_t)1 }, + { 0, 0, 0, 0 } +}; + +static const HashTable JSClientRectListPrototypeTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSClientRectListPrototypeTableValues, 0 }; +#else + { 2, 1, JSClientRectListPrototypeTableValues, 0 }; +#endif + +const ClassInfo JSClientRectListPrototype::s_info = { "ClientRectListPrototype", 0, &JSClientRectListPrototypeTable, 0 }; + +JSObject* JSClientRectListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) +{ + return getDOMPrototype<JSClientRectList>(exec, globalObject); +} + +bool JSClientRectListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticFunctionSlot<JSObject>(exec, &JSClientRectListPrototypeTable, this, propertyName, slot); +} + +const ClassInfo JSClientRectList::s_info = { "ClientRectList", 0, &JSClientRectListTable, 0 }; + +JSClientRectList::JSClientRectList(PassRefPtr<Structure> structure, PassRefPtr<ClientRectList> impl) + : DOMObject(structure) + , m_impl(impl) +{ +} + +JSClientRectList::~JSClientRectList() +{ + forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); +} + +JSObject* JSClientRectList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) +{ + return new (exec) JSClientRectListPrototype(JSClientRectListPrototype::createStructure(globalObject->objectPrototype())); +} + +bool JSClientRectList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + const HashEntry* entry = JSClientRectListTable.entry(exec, propertyName); + if (entry) { + slot.setCustom(this, entry->propertyGetter()); + return true; + } + bool ok; + unsigned index = propertyName.toUInt32(&ok, false); + if (ok && index < static_cast<ClientRectList*>(impl())->length()) { + slot.setCustomIndex(this, index, indexGetter); + return true; + } + return getStaticValueSlot<JSClientRectList, Base>(exec, &JSClientRectListTable, this, propertyName, slot); +} + +bool JSClientRectList::getOwnPropertySlot(ExecState* exec, unsigned propertyName, PropertySlot& slot) +{ + if (propertyName < static_cast<ClientRectList*>(impl())->length()) { + slot.setCustomIndex(this, propertyName, indexGetter); + return true; + } + return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); +} + +JSValue jsClientRectListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + ClientRectList* imp = static_cast<ClientRectList*>(static_cast<JSClientRectList*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->length()); +} + +JSValue jsClientRectListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + return static_cast<JSClientRectList*>(asObject(slot.slotBase()))->getConstructor(exec); +} +void JSClientRectList::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames) +{ + for (unsigned i = 0; i < static_cast<ClientRectList*>(impl())->length(); ++i) + propertyNames.add(Identifier::from(exec, i)); + Base::getPropertyNames(exec, propertyNames); +} + +JSValue JSClientRectList::getConstructor(ExecState* exec) +{ + return getDOMConstructor<JSClientRectListConstructor>(exec); +} + +JSValue JSC_HOST_CALL jsClientRectListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSClientRectList::s_info)) + return throwError(exec, TypeError); + JSClientRectList* castedThisObj = static_cast<JSClientRectList*>(asObject(thisValue)); + ClientRectList* imp = static_cast<ClientRectList*>(castedThisObj->impl()); + int index = args.at(0).toInt32(exec); + if (index < 0) { + setDOMException(exec, INDEX_SIZE_ERR); + return jsUndefined(); + } + + + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); + return result; +} + + +JSValue JSClientRectList::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSClientRectList* thisObj = static_cast<JSClientRectList*>(asObject(slot.slotBase())); + return toJS(exec, static_cast<ClientRectList*>(thisObj->impl())->item(slot.index())); +} +JSC::JSValue toJS(JSC::ExecState* exec, ClientRectList* object) +{ + return getDOMObjectWrapper<JSClientRectList>(exec, object); +} +ClientRectList* toClientRectList(JSC::JSValue value) +{ + return value.isObject(&JSClientRectList::s_info) ? static_cast<JSClientRectList*>(asObject(value))->impl() : 0; +} + +} diff --git a/src/3rdparty/webkit/WebCore/generated/JSClientRectList.h b/src/3rdparty/webkit/WebCore/generated/JSClientRectList.h new file mode 100644 index 0000000000..fcb1f563f6 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSClientRectList.h @@ -0,0 +1,84 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef JSClientRectList_h +#define JSClientRectList_h + +#include "JSDOMBinding.h" +#include <runtime/JSGlobalObject.h> +#include <runtime/ObjectPrototype.h> + +namespace WebCore { + +class ClientRectList; + +class JSClientRectList : public DOMObject { + typedef DOMObject Base; +public: + JSClientRectList(PassRefPtr<JSC::Structure>, PassRefPtr<ClientRectList>); + virtual ~JSClientRectList(); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); + virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + + virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); + static JSC::JSValue getConstructor(JSC::ExecState*); + ClientRectList* impl() const { return m_impl.get(); } + +private: + RefPtr<ClientRectList> m_impl; + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +}; + +JSC::JSValue toJS(JSC::ExecState*, ClientRectList*); +ClientRectList* toClientRectList(JSC::JSValue); + +class JSClientRectListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; +public: + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + JSClientRectListPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } +}; + +// Functions + +JSC::JSValue JSC_HOST_CALL jsClientRectListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +// Attributes + +JSC::JSValue jsClientRectListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsClientRectListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + +} // namespace WebCore + +#endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSClipboard.cpp b/src/3rdparty/webkit/WebCore/generated/JSClipboard.cpp index de87a53985..115b5de736 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSClipboard.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSClipboard.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSClipboard) +ASSERT_CLASS_FITS_IN_CELL(JSClipboard); /* Hash table */ @@ -73,13 +73,13 @@ public: JSClipboardConstructor(ExecState* exec) : DOMObject(JSClipboardConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSClipboardPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSClipboardPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -112,9 +112,9 @@ static const HashTable JSClipboardPrototypeTable = const ClassInfo JSClipboardPrototype::s_info = { "ClipboardPrototype", 0, &JSClipboardPrototypeTable, 0 }; -JSObject* JSClipboardPrototype::self(ExecState* exec) +JSObject* JSClipboardPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSClipboard>(exec); + return getDOMPrototype<JSClipboard>(exec, globalObject); } bool JSClipboardPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -133,12 +133,11 @@ JSClipboard::JSClipboard(PassRefPtr<Structure> structure, PassRefPtr<Clipboard> JSClipboard::~JSClipboard() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSClipboard::createPrototype(ExecState* exec) +JSObject* JSClipboard::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSClipboardPrototype(JSClipboardPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSClipboardPrototype(JSClipboardPrototype::createStructure(globalObject->objectPrototype())); } bool JSClipboard::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -146,88 +145,94 @@ bool JSClipboard::getOwnPropertySlot(ExecState* exec, const Identifier& property return getStaticValueSlot<JSClipboard, Base>(exec, &JSClipboardTable, this, propertyName, slot); } -JSValuePtr jsClipboardDropEffect(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsClipboardDropEffect(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Clipboard* imp = static_cast<Clipboard*>(static_cast<JSClipboard*>(asObject(slot.slotBase()))->impl()); return jsStringOrUndefined(exec, imp->dropEffect()); } -JSValuePtr jsClipboardEffectAllowed(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsClipboardEffectAllowed(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Clipboard* imp = static_cast<Clipboard*>(static_cast<JSClipboard*>(asObject(slot.slotBase()))->impl()); return jsStringOrUndefined(exec, imp->effectAllowed()); } -JSValuePtr jsClipboardTypes(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsClipboardTypes(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSClipboard*>(asObject(slot.slotBase()))->types(exec); } -JSValuePtr jsClipboardConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsClipboardConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSClipboard*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSClipboard::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSClipboard::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSClipboard, Base>(exec, propertyName, value, &JSClipboardTable, this, slot); } -void setJSClipboardDropEffect(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSClipboardDropEffect(ExecState* exec, JSObject* thisObject, JSValue value) { Clipboard* imp = static_cast<Clipboard*>(static_cast<JSClipboard*>(thisObject)->impl()); - imp->setDropEffect(value->toString(exec)); + imp->setDropEffect(value.toString(exec)); } -void setJSClipboardEffectAllowed(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSClipboardEffectAllowed(ExecState* exec, JSObject* thisObject, JSValue value) { Clipboard* imp = static_cast<Clipboard*>(static_cast<JSClipboard*>(thisObject)->impl()); - imp->setEffectAllowed(value->toString(exec)); + imp->setEffectAllowed(value.toString(exec)); } -JSValuePtr JSClipboard::getConstructor(ExecState* exec) +JSValue JSClipboard::getConstructor(ExecState* exec) { return getDOMConstructor<JSClipboardConstructor>(exec); } -JSValuePtr jsClipboardPrototypeFunctionClearData(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsClipboardPrototypeFunctionClearData(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSClipboard::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSClipboard::s_info)) return throwError(exec, TypeError); JSClipboard* castedThisObj = static_cast<JSClipboard*>(asObject(thisValue)); return castedThisObj->clearData(exec, args); } -JSValuePtr jsClipboardPrototypeFunctionGetData(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsClipboardPrototypeFunctionGetData(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSClipboard::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSClipboard::s_info)) return throwError(exec, TypeError); JSClipboard* castedThisObj = static_cast<JSClipboard*>(asObject(thisValue)); return castedThisObj->getData(exec, args); } -JSValuePtr jsClipboardPrototypeFunctionSetData(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsClipboardPrototypeFunctionSetData(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSClipboard::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSClipboard::s_info)) return throwError(exec, TypeError); JSClipboard* castedThisObj = static_cast<JSClipboard*>(asObject(thisValue)); return castedThisObj->setData(exec, args); } -JSValuePtr jsClipboardPrototypeFunctionSetDragImage(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsClipboardPrototypeFunctionSetDragImage(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSClipboard::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSClipboard::s_info)) return throwError(exec, TypeError); JSClipboard* castedThisObj = static_cast<JSClipboard*>(asObject(thisValue)); return castedThisObj->setDragImage(exec, args); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, Clipboard* object) +JSC::JSValue toJS(JSC::ExecState* exec, Clipboard* object) { return getDOMObjectWrapper<JSClipboard>(exec, object); } -Clipboard* toClipboard(JSC::JSValuePtr value) +Clipboard* toClipboard(JSC::JSValue value) { - return value->isObject(&JSClipboard::s_info) ? static_cast<JSClipboard*>(asObject(value))->impl() : 0; + return value.isObject(&JSClipboard::s_info) ? static_cast<JSClipboard*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSClipboard.h b/src/3rdparty/webkit/WebCore/generated/JSClipboard.h index 6f5ea7fc67..a9d51ab280 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSClipboard.h +++ b/src/3rdparty/webkit/WebCore/generated/JSClipboard.h @@ -34,43 +34,44 @@ class JSClipboard : public DOMObject { public: JSClipboard(PassRefPtr<JSC::Structure>, PassRefPtr<Clipboard>); virtual ~JSClipboard(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom attributes - JSC::JSValuePtr types(JSC::ExecState*) const; + JSC::JSValue types(JSC::ExecState*) const; // Custom functions - JSC::JSValuePtr clearData(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr getData(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr setData(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr setDragImage(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue clearData(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue getData(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setData(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setDragImage(JSC::ExecState*, const JSC::ArgList&); Clipboard* impl() const { return m_impl.get(); } private: RefPtr<Clipboard> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, Clipboard*); -Clipboard* toClipboard(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, Clipboard*); +Clipboard* toClipboard(JSC::JSValue); class JSClipboardPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -79,18 +80,18 @@ public: // Functions -JSC::JSValuePtr jsClipboardPrototypeFunctionClearData(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsClipboardPrototypeFunctionGetData(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsClipboardPrototypeFunctionSetData(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsClipboardPrototypeFunctionSetDragImage(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsClipboardPrototypeFunctionClearData(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsClipboardPrototypeFunctionGetData(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsClipboardPrototypeFunctionSetData(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsClipboardPrototypeFunctionSetDragImage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsClipboardDropEffect(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSClipboardDropEffect(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsClipboardEffectAllowed(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSClipboardEffectAllowed(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsClipboardTypes(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsClipboardConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsClipboardDropEffect(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSClipboardDropEffect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsClipboardEffectAllowed(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSClipboardEffectAllowed(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsClipboardTypes(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsClipboardConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSComment.cpp b/src/3rdparty/webkit/WebCore/generated/JSComment.cpp index 8da1d42e51..bb7a0fa4e7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSComment.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSComment.cpp @@ -32,7 +32,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSComment) +ASSERT_CLASS_FITS_IN_CELL(JSComment); /* Hash table */ @@ -68,13 +68,13 @@ public: JSCommentConstructor(ExecState* exec) : DOMObject(JSCommentConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCommentPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCommentPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -103,9 +103,9 @@ static const HashTable JSCommentPrototypeTable = const ClassInfo JSCommentPrototype::s_info = { "CommentPrototype", 0, &JSCommentPrototypeTable, 0 }; -JSObject* JSCommentPrototype::self(ExecState* exec) +JSObject* JSCommentPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSComment>(exec); + return getDOMPrototype<JSComment>(exec, globalObject); } const ClassInfo JSComment::s_info = { "Comment", &JSCharacterData::s_info, &JSCommentTable, 0 }; @@ -115,9 +115,9 @@ JSComment::JSComment(PassRefPtr<Structure> structure, PassRefPtr<Comment> impl) { } -JSObject* JSComment::createPrototype(ExecState* exec) +JSObject* JSComment::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCommentPrototype(JSCommentPrototype::createStructure(JSCharacterDataPrototype::self(exec))); + return new (exec) JSCommentPrototype(JSCommentPrototype::createStructure(JSCharacterDataPrototype::self(exec, globalObject))); } bool JSComment::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -125,11 +125,11 @@ bool JSComment::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa return getStaticValueSlot<JSComment, Base>(exec, &JSCommentTable, this, propertyName, slot); } -JSValuePtr jsCommentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCommentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSComment*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSComment::getConstructor(ExecState* exec) +JSValue JSComment::getConstructor(ExecState* exec) { return getDOMConstructor<JSCommentConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSComment.h b/src/3rdparty/webkit/WebCore/generated/JSComment.h index b0dc55b76b..802256e2cb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSComment.h +++ b/src/3rdparty/webkit/WebCore/generated/JSComment.h @@ -31,23 +31,24 @@ class JSComment : public JSCharacterData { typedef JSCharacterData Base; public: JSComment(PassRefPtr<JSC::Structure>, PassRefPtr<Comment>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSCommentPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSCommentPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -55,7 +56,7 @@ public: // Attributes -JSC::JSValuePtr jsCommentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCommentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSConsole.cpp b/src/3rdparty/webkit/WebCore/generated/JSConsole.cpp index 6adba2870d..7ae8c6e560 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSConsole.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSConsole.cpp @@ -33,7 +33,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSConsole) +ASSERT_CLASS_FITS_IN_CELL(JSConsole); /* Hash table */ @@ -82,9 +82,9 @@ static const HashTable JSConsolePrototypeTable = const ClassInfo JSConsolePrototype::s_info = { "ConsolePrototype", 0, &JSConsolePrototypeTable, 0 }; -JSObject* JSConsolePrototype::self(ExecState* exec) +JSObject* JSConsolePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSConsole>(exec); + return getDOMPrototype<JSConsole>(exec, globalObject); } bool JSConsolePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -103,12 +103,11 @@ JSConsole::JSConsole(PassRefPtr<Structure> structure, PassRefPtr<Console> impl) JSConsole::~JSConsole() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSConsole::createPrototype(ExecState* exec) +JSObject* JSConsole::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSConsolePrototype(JSConsolePrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSConsolePrototype(JSConsolePrototype::createStructure(globalObject->objectPrototype())); } bool JSConsole::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -116,14 +115,15 @@ bool JSConsole::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa return getStaticValueSlot<JSConsole, Base>(exec, &JSConsoleTable, this, propertyName, slot); } -JSValuePtr jsConsoleProfiles(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsConsoleProfiles(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSConsole*>(asObject(slot.slotBase()))->profiles(exec); } -JSValuePtr jsConsolePrototypeFunctionDebug(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsConsolePrototypeFunctionDebug(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSConsole::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSConsole::s_info)) return throwError(exec, TypeError); JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue)); Console* imp = static_cast<Console*>(castedThisObj->impl()); @@ -133,9 +133,10 @@ JSValuePtr jsConsolePrototypeFunctionDebug(ExecState* exec, JSObject*, JSValuePt return jsUndefined(); } -JSValuePtr jsConsolePrototypeFunctionError(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsConsolePrototypeFunctionError(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSConsole::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSConsole::s_info)) return throwError(exec, TypeError); JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue)); Console* imp = static_cast<Console*>(castedThisObj->impl()); @@ -145,9 +146,10 @@ JSValuePtr jsConsolePrototypeFunctionError(ExecState* exec, JSObject*, JSValuePt return jsUndefined(); } -JSValuePtr jsConsolePrototypeFunctionInfo(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsConsolePrototypeFunctionInfo(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSConsole::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSConsole::s_info)) return throwError(exec, TypeError); JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue)); Console* imp = static_cast<Console*>(castedThisObj->impl()); @@ -157,9 +159,10 @@ JSValuePtr jsConsolePrototypeFunctionInfo(ExecState* exec, JSObject*, JSValuePtr return jsUndefined(); } -JSValuePtr jsConsolePrototypeFunctionLog(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsConsolePrototypeFunctionLog(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSConsole::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSConsole::s_info)) return throwError(exec, TypeError); JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue)); Console* imp = static_cast<Console*>(castedThisObj->impl()); @@ -169,9 +172,10 @@ JSValuePtr jsConsolePrototypeFunctionLog(ExecState* exec, JSObject*, JSValuePtr return jsUndefined(); } -JSValuePtr jsConsolePrototypeFunctionWarn(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsConsolePrototypeFunctionWarn(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSConsole::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSConsole::s_info)) return throwError(exec, TypeError); JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue)); Console* imp = static_cast<Console*>(castedThisObj->impl()); @@ -181,9 +185,10 @@ JSValuePtr jsConsolePrototypeFunctionWarn(ExecState* exec, JSObject*, JSValuePtr return jsUndefined(); } -JSValuePtr jsConsolePrototypeFunctionDir(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsConsolePrototypeFunctionDir(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSConsole::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSConsole::s_info)) return throwError(exec, TypeError); JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue)); Console* imp = static_cast<Console*>(castedThisObj->impl()); @@ -193,9 +198,10 @@ JSValuePtr jsConsolePrototypeFunctionDir(ExecState* exec, JSObject*, JSValuePtr return jsUndefined(); } -JSValuePtr jsConsolePrototypeFunctionDirxml(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsConsolePrototypeFunctionDirxml(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSConsole::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSConsole::s_info)) return throwError(exec, TypeError); JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue)); Console* imp = static_cast<Console*>(castedThisObj->impl()); @@ -205,9 +211,10 @@ JSValuePtr jsConsolePrototypeFunctionDirxml(ExecState* exec, JSObject*, JSValueP return jsUndefined(); } -JSValuePtr jsConsolePrototypeFunctionTrace(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsConsolePrototypeFunctionTrace(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSConsole::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSConsole::s_info)) return throwError(exec, TypeError); JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue)); Console* imp = static_cast<Console*>(castedThisObj->impl()); @@ -217,22 +224,24 @@ JSValuePtr jsConsolePrototypeFunctionTrace(ExecState* exec, JSObject*, JSValuePt return jsUndefined(); } -JSValuePtr jsConsolePrototypeFunctionAssert(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsConsolePrototypeFunctionAssert(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSConsole::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSConsole::s_info)) return throwError(exec, TypeError); JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue)); Console* imp = static_cast<Console*>(castedThisObj->impl()); ScriptCallStack callStack(exec, args, 1); - bool condition = args.at(exec, 0)->toBoolean(exec); + bool condition = args.at(0).toBoolean(exec); imp->assertCondition(condition, &callStack); return jsUndefined(); } -JSValuePtr jsConsolePrototypeFunctionCount(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsConsolePrototypeFunctionCount(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSConsole::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSConsole::s_info)) return throwError(exec, TypeError); JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue)); Console* imp = static_cast<Console*>(castedThisObj->impl()); @@ -242,60 +251,65 @@ JSValuePtr jsConsolePrototypeFunctionCount(ExecState* exec, JSObject*, JSValuePt return jsUndefined(); } -JSValuePtr jsConsolePrototypeFunctionProfile(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsConsolePrototypeFunctionProfile(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSConsole::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSConsole::s_info)) return throwError(exec, TypeError); JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue)); Console* imp = static_cast<Console*>(castedThisObj->impl()); ScriptCallStack callStack(exec, args, 1); - const UString& title = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 0)); + const UString& title = valueToStringWithUndefinedOrNullCheck(exec, args.at(0)); imp->profile(title, &callStack); return jsUndefined(); } -JSValuePtr jsConsolePrototypeFunctionProfileEnd(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsConsolePrototypeFunctionProfileEnd(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSConsole::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSConsole::s_info)) return throwError(exec, TypeError); JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue)); Console* imp = static_cast<Console*>(castedThisObj->impl()); ScriptCallStack callStack(exec, args, 1); - const UString& title = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 0)); + const UString& title = valueToStringWithUndefinedOrNullCheck(exec, args.at(0)); imp->profileEnd(title, &callStack); return jsUndefined(); } -JSValuePtr jsConsolePrototypeFunctionTime(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsConsolePrototypeFunctionTime(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSConsole::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSConsole::s_info)) return throwError(exec, TypeError); JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue)); Console* imp = static_cast<Console*>(castedThisObj->impl()); - const UString& title = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 0)); + const UString& title = valueToStringWithUndefinedOrNullCheck(exec, args.at(0)); imp->time(title); return jsUndefined(); } -JSValuePtr jsConsolePrototypeFunctionTimeEnd(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsConsolePrototypeFunctionTimeEnd(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSConsole::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSConsole::s_info)) return throwError(exec, TypeError); JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue)); Console* imp = static_cast<Console*>(castedThisObj->impl()); ScriptCallStack callStack(exec, args, 1); - const UString& title = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 0)); + const UString& title = valueToStringWithUndefinedOrNullCheck(exec, args.at(0)); imp->timeEnd(title, &callStack); return jsUndefined(); } -JSValuePtr jsConsolePrototypeFunctionGroup(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsConsolePrototypeFunctionGroup(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSConsole::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSConsole::s_info)) return throwError(exec, TypeError); JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue)); Console* imp = static_cast<Console*>(castedThisObj->impl()); @@ -305,9 +319,10 @@ JSValuePtr jsConsolePrototypeFunctionGroup(ExecState* exec, JSObject*, JSValuePt return jsUndefined(); } -JSValuePtr jsConsolePrototypeFunctionGroupEnd(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsConsolePrototypeFunctionGroupEnd(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSConsole::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSConsole::s_info)) return throwError(exec, TypeError); JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue)); Console* imp = static_cast<Console*>(castedThisObj->impl()); @@ -316,13 +331,13 @@ JSValuePtr jsConsolePrototypeFunctionGroupEnd(ExecState* exec, JSObject*, JSValu return jsUndefined(); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, Console* object) +JSC::JSValue toJS(JSC::ExecState* exec, Console* object) { return getDOMObjectWrapper<JSConsole>(exec, object); } -Console* toConsole(JSC::JSValuePtr value) +Console* toConsole(JSC::JSValue value) { - return value->isObject(&JSConsole::s_info) ? static_cast<JSConsole*>(asObject(value))->impl() : 0; + return value.isObject(&JSConsole::s_info) ? static_cast<JSConsole*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSConsole.h b/src/3rdparty/webkit/WebCore/generated/JSConsole.h index d080c11c9d..0b7f0d53b2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSConsole.h +++ b/src/3rdparty/webkit/WebCore/generated/JSConsole.h @@ -34,35 +34,36 @@ class JSConsole : public DOMObject { public: JSConsole(PassRefPtr<JSC::Structure>, PassRefPtr<Console>); virtual ~JSConsole(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } // Custom attributes - JSC::JSValuePtr profiles(JSC::ExecState*) const; + JSC::JSValue profiles(JSC::ExecState*) const; Console* impl() const { return m_impl.get(); } private: RefPtr<Console> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, Console*); -Console* toConsole(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, Console*); +Console* toConsole(JSC::JSValue); class JSConsolePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -71,25 +72,25 @@ public: // Functions -JSC::JSValuePtr jsConsolePrototypeFunctionDebug(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsConsolePrototypeFunctionError(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsConsolePrototypeFunctionInfo(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsConsolePrototypeFunctionLog(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsConsolePrototypeFunctionWarn(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsConsolePrototypeFunctionDir(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsConsolePrototypeFunctionDirxml(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsConsolePrototypeFunctionTrace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsConsolePrototypeFunctionAssert(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsConsolePrototypeFunctionCount(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsConsolePrototypeFunctionProfile(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsConsolePrototypeFunctionProfileEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsConsolePrototypeFunctionTime(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsConsolePrototypeFunctionTimeEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsConsolePrototypeFunctionGroup(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsConsolePrototypeFunctionGroupEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsConsolePrototypeFunctionDebug(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsConsolePrototypeFunctionError(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsConsolePrototypeFunctionInfo(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsConsolePrototypeFunctionLog(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsConsolePrototypeFunctionWarn(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsConsolePrototypeFunctionDir(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsConsolePrototypeFunctionDirxml(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsConsolePrototypeFunctionTrace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsConsolePrototypeFunctionAssert(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsConsolePrototypeFunctionCount(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsConsolePrototypeFunctionProfile(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsConsolePrototypeFunctionProfileEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsConsolePrototypeFunctionTime(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsConsolePrototypeFunctionTimeEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsConsolePrototypeFunctionGroup(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsConsolePrototypeFunctionGroupEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsConsoleProfiles(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsConsoleProfiles(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSCoordinates.cpp b/src/3rdparty/webkit/WebCore/generated/JSCoordinates.cpp new file mode 100644 index 0000000000..12525b9a0a --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSCoordinates.cpp @@ -0,0 +1,174 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "config.h" + +#include "JSCoordinates.h" + +#include <wtf/GetPtr.h> + +#include "Coordinates.h" +#include "KURL.h" + +#include <runtime/Error.h> +#include <runtime/JSNumberCell.h> +#include <runtime/JSString.h> + +using namespace JSC; + +namespace WebCore { + +ASSERT_CLASS_FITS_IN_CELL(JSCoordinates); + +/* Hash table */ + +static const HashTableValue JSCoordinatesTableValues[8] = +{ + { "latitude", DontDelete|ReadOnly, (intptr_t)jsCoordinatesLatitude, (intptr_t)0 }, + { "longitude", DontDelete|ReadOnly, (intptr_t)jsCoordinatesLongitude, (intptr_t)0 }, + { "altitude", DontDelete|ReadOnly, (intptr_t)jsCoordinatesAltitude, (intptr_t)0 }, + { "accuracy", DontDelete|ReadOnly, (intptr_t)jsCoordinatesAccuracy, (intptr_t)0 }, + { "altitudeAccuracy", DontDelete|ReadOnly, (intptr_t)jsCoordinatesAltitudeAccuracy, (intptr_t)0 }, + { "heading", DontDelete|ReadOnly, (intptr_t)jsCoordinatesHeading, (intptr_t)0 }, + { "speed", DontDelete|ReadOnly, (intptr_t)jsCoordinatesSpeed, (intptr_t)0 }, + { 0, 0, 0, 0 } +}; + +static const HashTable JSCoordinatesTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 15, JSCoordinatesTableValues, 0 }; +#else + { 16, 15, JSCoordinatesTableValues, 0 }; +#endif + +/* Hash table for prototype */ + +static const HashTableValue JSCoordinatesPrototypeTableValues[2] = +{ + { "toString", DontDelete|DontEnum|Function, (intptr_t)jsCoordinatesPrototypeFunctionToString, (intptr_t)0 }, + { 0, 0, 0, 0 } +}; + +static const HashTable JSCoordinatesPrototypeTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSCoordinatesPrototypeTableValues, 0 }; +#else + { 2, 1, JSCoordinatesPrototypeTableValues, 0 }; +#endif + +const ClassInfo JSCoordinatesPrototype::s_info = { "CoordinatesPrototype", 0, &JSCoordinatesPrototypeTable, 0 }; + +JSObject* JSCoordinatesPrototype::self(ExecState* exec, JSGlobalObject* globalObject) +{ + return getDOMPrototype<JSCoordinates>(exec, globalObject); +} + +bool JSCoordinatesPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticFunctionSlot<JSObject>(exec, &JSCoordinatesPrototypeTable, this, propertyName, slot); +} + +const ClassInfo JSCoordinates::s_info = { "Coordinates", 0, &JSCoordinatesTable, 0 }; + +JSCoordinates::JSCoordinates(PassRefPtr<Structure> structure, PassRefPtr<Coordinates> impl) + : DOMObject(structure) + , m_impl(impl) +{ +} + +JSCoordinates::~JSCoordinates() +{ + forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); +} + +JSObject* JSCoordinates::createPrototype(ExecState* exec, JSGlobalObject* globalObject) +{ + return new (exec) JSCoordinatesPrototype(JSCoordinatesPrototype::createStructure(globalObject->objectPrototype())); +} + +bool JSCoordinates::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot<JSCoordinates, Base>(exec, &JSCoordinatesTable, this, propertyName, slot); +} + +JSValue jsCoordinatesLatitude(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Coordinates* imp = static_cast<Coordinates*>(static_cast<JSCoordinates*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->latitude()); +} + +JSValue jsCoordinatesLongitude(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Coordinates* imp = static_cast<Coordinates*>(static_cast<JSCoordinates*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->longitude()); +} + +JSValue jsCoordinatesAltitude(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + return static_cast<JSCoordinates*>(asObject(slot.slotBase()))->altitude(exec); +} + +JSValue jsCoordinatesAccuracy(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Coordinates* imp = static_cast<Coordinates*>(static_cast<JSCoordinates*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->accuracy()); +} + +JSValue jsCoordinatesAltitudeAccuracy(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + return static_cast<JSCoordinates*>(asObject(slot.slotBase()))->altitudeAccuracy(exec); +} + +JSValue jsCoordinatesHeading(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + return static_cast<JSCoordinates*>(asObject(slot.slotBase()))->heading(exec); +} + +JSValue jsCoordinatesSpeed(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + return static_cast<JSCoordinates*>(asObject(slot.slotBase()))->speed(exec); +} + +JSValue JSC_HOST_CALL jsCoordinatesPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSCoordinates::s_info)) + return throwError(exec, TypeError); + JSCoordinates* castedThisObj = static_cast<JSCoordinates*>(asObject(thisValue)); + Coordinates* imp = static_cast<Coordinates*>(castedThisObj->impl()); + + + JSC::JSValue result = jsString(exec, imp->toString()); + return result; +} + +JSC::JSValue toJS(JSC::ExecState* exec, Coordinates* object) +{ + return getDOMObjectWrapper<JSCoordinates>(exec, object); +} +Coordinates* toCoordinates(JSC::JSValue value) +{ + return value.isObject(&JSCoordinates::s_info) ? static_cast<JSCoordinates*>(asObject(value))->impl() : 0; +} + +} diff --git a/src/3rdparty/webkit/WebCore/generated/JSCoordinates.h b/src/3rdparty/webkit/WebCore/generated/JSCoordinates.h new file mode 100644 index 0000000000..8a8643da29 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSCoordinates.h @@ -0,0 +1,91 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef JSCoordinates_h +#define JSCoordinates_h + +#include "JSDOMBinding.h" +#include <runtime/JSGlobalObject.h> +#include <runtime/ObjectPrototype.h> + +namespace WebCore { + +class Coordinates; + +class JSCoordinates : public DOMObject { + typedef DOMObject Base; +public: + JSCoordinates(PassRefPtr<JSC::Structure>, PassRefPtr<Coordinates>); + virtual ~JSCoordinates(); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + + + // Custom attributes + JSC::JSValue altitude(JSC::ExecState*) const; + JSC::JSValue altitudeAccuracy(JSC::ExecState*) const; + JSC::JSValue heading(JSC::ExecState*) const; + JSC::JSValue speed(JSC::ExecState*) const; + Coordinates* impl() const { return m_impl.get(); } + +private: + RefPtr<Coordinates> m_impl; +}; + +JSC::JSValue toJS(JSC::ExecState*, Coordinates*); +Coordinates* toCoordinates(JSC::JSValue); + +class JSCoordinatesPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; +public: + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + JSCoordinatesPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } +}; + +// Functions + +JSC::JSValue JSC_HOST_CALL jsCoordinatesPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +// Attributes + +JSC::JSValue jsCoordinatesLatitude(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCoordinatesLongitude(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCoordinatesAltitude(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCoordinatesAccuracy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCoordinatesAltitudeAccuracy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCoordinatesHeading(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCoordinatesSpeed(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + +} // namespace WebCore + +#endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSCounter.cpp b/src/3rdparty/webkit/WebCore/generated/JSCounter.cpp index 72c22e4c14..da87cd919e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCounter.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCounter.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSCounter) +ASSERT_CLASS_FITS_IN_CELL(JSCounter); /* Hash table */ @@ -73,13 +73,13 @@ public: JSCounterConstructor(ExecState* exec) : DOMObject(JSCounterConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSCounterPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSCounterPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -108,9 +108,9 @@ static const HashTable JSCounterPrototypeTable = const ClassInfo JSCounterPrototype::s_info = { "CounterPrototype", 0, &JSCounterPrototypeTable, 0 }; -JSObject* JSCounterPrototype::self(ExecState* exec) +JSObject* JSCounterPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSCounter>(exec); + return getDOMPrototype<JSCounter>(exec, globalObject); } const ClassInfo JSCounter::s_info = { "Counter", 0, &JSCounterTable, 0 }; @@ -124,12 +124,11 @@ JSCounter::JSCounter(PassRefPtr<Structure> structure, PassRefPtr<Counter> impl) JSCounter::~JSCounter() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSCounter::createPrototype(ExecState* exec) +JSObject* JSCounter::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSCounterPrototype(JSCounterPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSCounterPrototype(JSCounterPrototype::createStructure(globalObject->objectPrototype())); } bool JSCounter::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -137,40 +136,43 @@ bool JSCounter::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa return getStaticValueSlot<JSCounter, Base>(exec, &JSCounterTable, this, propertyName, slot); } -JSValuePtr jsCounterIdentifier(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCounterIdentifier(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Counter* imp = static_cast<Counter*>(static_cast<JSCounter*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->identifier()); } -JSValuePtr jsCounterListStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCounterListStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Counter* imp = static_cast<Counter*>(static_cast<JSCounter*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->listStyle()); } -JSValuePtr jsCounterSeparator(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCounterSeparator(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Counter* imp = static_cast<Counter*>(static_cast<JSCounter*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->separator()); } -JSValuePtr jsCounterConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsCounterConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSCounter*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSCounter::getConstructor(ExecState* exec) +JSValue JSCounter::getConstructor(ExecState* exec) { return getDOMConstructor<JSCounterConstructor>(exec); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, Counter* object) +JSC::JSValue toJS(JSC::ExecState* exec, Counter* object) { return getDOMObjectWrapper<JSCounter>(exec, object); } -Counter* toCounter(JSC::JSValuePtr value) +Counter* toCounter(JSC::JSValue value) { - return value->isObject(&JSCounter::s_info) ? static_cast<JSCounter*>(asObject(value))->impl() : 0; + return value.isObject(&JSCounter::s_info) ? static_cast<JSCounter*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCounter.h b/src/3rdparty/webkit/WebCore/generated/JSCounter.h index 6517bc4235..ab195fe3be 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCounter.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCounter.h @@ -34,29 +34,30 @@ class JSCounter : public DOMObject { public: JSCounter(PassRefPtr<JSC::Structure>, PassRefPtr<Counter>); virtual ~JSCounter(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); Counter* impl() const { return m_impl.get(); } private: RefPtr<Counter> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, Counter*); -Counter* toCounter(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, Counter*); +Counter* toCounter(JSC::JSValue); class JSCounterPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSCounterPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -64,10 +65,10 @@ public: // Attributes -JSC::JSValuePtr jsCounterIdentifier(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCounterListStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCounterSeparator(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsCounterConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCounterIdentifier(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCounterListStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCounterSeparator(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsCounterConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMApplicationCache.cpp b/src/3rdparty/webkit/WebCore/generated/JSDOMApplicationCache.cpp index dd8939b8e6..8b0a79e25f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMApplicationCache.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMApplicationCache.cpp @@ -28,12 +28,10 @@ #include <wtf/GetPtr.h> #include "DOMApplicationCache.h" -#include "DOMStringList.h" #include "Event.h" #include "EventListener.h" #include "Frame.h" #include "JSDOMGlobalObject.h" -#include "JSDOMStringList.h" #include "JSEvent.h" #include "JSEventListener.h" @@ -44,14 +42,13 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSDOMApplicationCache) +ASSERT_CLASS_FITS_IN_CELL(JSDOMApplicationCache); /* Hash table */ static const HashTableValue JSDOMApplicationCacheTableValues[10] = { { "status", DontDelete|ReadOnly, (intptr_t)jsDOMApplicationCacheStatus, (intptr_t)0 }, - { "items", DontDelete|ReadOnly, (intptr_t)jsDOMApplicationCacheItems, (intptr_t)0 }, { "onchecking", DontDelete, (intptr_t)jsDOMApplicationCacheOnchecking, (intptr_t)setJSDOMApplicationCacheOnchecking }, { "onerror", DontDelete, (intptr_t)jsDOMApplicationCacheOnerror, (intptr_t)setJSDOMApplicationCacheOnerror }, { "onnoupdate", DontDelete, (intptr_t)jsDOMApplicationCacheOnnoupdate, (intptr_t)setJSDOMApplicationCacheOnnoupdate }, @@ -59,6 +56,7 @@ static const HashTableValue JSDOMApplicationCacheTableValues[10] = { "onprogress", DontDelete, (intptr_t)jsDOMApplicationCacheOnprogress, (intptr_t)setJSDOMApplicationCacheOnprogress }, { "onupdateready", DontDelete, (intptr_t)jsDOMApplicationCacheOnupdateready, (intptr_t)setJSDOMApplicationCacheOnupdateready }, { "oncached", DontDelete, (intptr_t)jsDOMApplicationCacheOncached, (intptr_t)setJSDOMApplicationCacheOncached }, + { "onobsolete", DontDelete, (intptr_t)jsDOMApplicationCacheOnobsolete, (intptr_t)setJSDOMApplicationCacheOnobsolete }, { 0, 0, 0, 0 } }; @@ -71,18 +69,16 @@ static const HashTable JSDOMApplicationCacheTable = /* Hash table for prototype */ -static const HashTableValue JSDOMApplicationCachePrototypeTableValues[14] = +static const HashTableValue JSDOMApplicationCachePrototypeTableValues[12] = { { "UNCACHED", DontDelete|ReadOnly, (intptr_t)jsDOMApplicationCacheUNCACHED, (intptr_t)0 }, { "IDLE", DontDelete|ReadOnly, (intptr_t)jsDOMApplicationCacheIDLE, (intptr_t)0 }, { "CHECKING", DontDelete|ReadOnly, (intptr_t)jsDOMApplicationCacheCHECKING, (intptr_t)0 }, { "DOWNLOADING", DontDelete|ReadOnly, (intptr_t)jsDOMApplicationCacheDOWNLOADING, (intptr_t)0 }, { "UPDATEREADY", DontDelete|ReadOnly, (intptr_t)jsDOMApplicationCacheUPDATEREADY, (intptr_t)0 }, + { "OBSOLETE", DontDelete|ReadOnly, (intptr_t)jsDOMApplicationCacheOBSOLETE, (intptr_t)0 }, { "update", DontDelete|Function, (intptr_t)jsDOMApplicationCachePrototypeFunctionUpdate, (intptr_t)0 }, { "swapCache", DontDelete|Function, (intptr_t)jsDOMApplicationCachePrototypeFunctionSwapCache, (intptr_t)0 }, - { "hasItem", DontDelete|Function, (intptr_t)jsDOMApplicationCachePrototypeFunctionHasItem, (intptr_t)1 }, - { "add", DontDelete|Function, (intptr_t)jsDOMApplicationCachePrototypeFunctionAdd, (intptr_t)1 }, - { "remove", DontDelete|Function, (intptr_t)jsDOMApplicationCachePrototypeFunctionRemove, (intptr_t)1 }, { "addEventListener", DontDelete|Function, (intptr_t)jsDOMApplicationCachePrototypeFunctionAddEventListener, (intptr_t)3 }, { "removeEventListener", DontDelete|Function, (intptr_t)jsDOMApplicationCachePrototypeFunctionRemoveEventListener, (intptr_t)3 }, { "dispatchEvent", DontDelete|Function, (intptr_t)jsDOMApplicationCachePrototypeFunctionDispatchEvent, (intptr_t)1 }, @@ -93,14 +89,14 @@ static const HashTable JSDOMApplicationCachePrototypeTable = #if ENABLE(PERFECT_HASH_SIZE) { 255, JSDOMApplicationCachePrototypeTableValues, 0 }; #else - { 35, 31, JSDOMApplicationCachePrototypeTableValues, 0 }; + { 33, 31, JSDOMApplicationCachePrototypeTableValues, 0 }; #endif const ClassInfo JSDOMApplicationCachePrototype::s_info = { "DOMApplicationCachePrototype", 0, &JSDOMApplicationCachePrototypeTable, 0 }; -JSObject* JSDOMApplicationCachePrototype::self(ExecState* exec) +JSObject* JSDOMApplicationCachePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSDOMApplicationCache>(exec); + return getDOMPrototype<JSDOMApplicationCache>(exec, globalObject); } bool JSDOMApplicationCachePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -119,12 +115,11 @@ JSDOMApplicationCache::JSDOMApplicationCache(PassRefPtr<Structure> structure, Pa JSDOMApplicationCache::~JSDOMApplicationCache() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSDOMApplicationCache::createPrototype(ExecState* exec) +JSObject* JSDOMApplicationCache::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSDOMApplicationCachePrototype(JSDOMApplicationCachePrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSDOMApplicationCachePrototype(JSDOMApplicationCachePrototype::createStructure(globalObject->objectPrototype())); } bool JSDOMApplicationCache::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -132,159 +127,190 @@ bool JSDOMApplicationCache::getOwnPropertySlot(ExecState* exec, const Identifier return getStaticValueSlot<JSDOMApplicationCache, Base>(exec, &JSDOMApplicationCacheTable, this, propertyName, slot); } -JSValuePtr jsDOMApplicationCacheStatus(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMApplicationCacheStatus(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->status()); } -JSValuePtr jsDOMApplicationCacheItems(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMApplicationCacheOnchecking(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->items())); + if (EventListener* listener = imp->onchecking()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); } -JSValuePtr jsDOMApplicationCacheOnchecking(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMApplicationCacheOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onchecking())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onerror()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMApplicationCacheOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMApplicationCacheOnnoupdate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onerror())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onnoupdate()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMApplicationCacheOnnoupdate(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMApplicationCacheOndownloading(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onnoupdate())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->ondownloading()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMApplicationCacheOndownloading(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMApplicationCacheOnprogress(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->ondownloading())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onprogress()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMApplicationCacheOnprogress(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMApplicationCacheOnupdateready(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onprogress())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onupdateready()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMApplicationCacheOnupdateready(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMApplicationCacheOncached(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onupdateready())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->oncached()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMApplicationCacheOncached(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMApplicationCacheOnobsolete(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->oncached())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onobsolete()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -void JSDOMApplicationCache::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSDOMApplicationCache::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSDOMApplicationCache, Base>(exec, propertyName, value, &JSDOMApplicationCacheTable, this, slot); } -void setJSDOMApplicationCacheOnchecking(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMApplicationCacheOnchecking(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnchecking(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMApplicationCacheOnerror(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnchecking(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnerror(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMApplicationCacheOnerror(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMApplicationCacheOnnoupdate(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnerror(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnnoupdate(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMApplicationCacheOnnoupdate(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMApplicationCacheOndownloading(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnnoupdate(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOndownloading(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMApplicationCacheOndownloading(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMApplicationCacheOnprogress(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOndownloading(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnprogress(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMApplicationCacheOnprogress(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMApplicationCacheOnupdateready(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnprogress(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnupdateready(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMApplicationCacheOnupdateready(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMApplicationCacheOncached(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnupdateready(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOncached(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMApplicationCacheOncached(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMApplicationCacheOnobsolete(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(static_cast<JSDOMApplicationCache*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOncached(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnobsolete(globalObject->createJSAttributeEventListener(value)); } -JSValuePtr jsDOMApplicationCachePrototypeFunctionUpdate(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMApplicationCachePrototypeFunctionUpdate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMApplicationCache::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMApplicationCache::s_info)) return throwError(exec, TypeError); JSDOMApplicationCache* castedThisObj = static_cast<JSDOMApplicationCache*>(asObject(thisValue)); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(castedThisObj->impl()); @@ -295,9 +321,10 @@ JSValuePtr jsDOMApplicationCachePrototypeFunctionUpdate(ExecState* exec, JSObjec return jsUndefined(); } -JSValuePtr jsDOMApplicationCachePrototypeFunctionSwapCache(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMApplicationCachePrototypeFunctionSwapCache(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMApplicationCache::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMApplicationCache::s_info)) return throwError(exec, TypeError); JSDOMApplicationCache* castedThisObj = static_cast<JSDOMApplicationCache*>(asObject(thisValue)); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(castedThisObj->impl()); @@ -308,95 +335,79 @@ JSValuePtr jsDOMApplicationCachePrototypeFunctionSwapCache(ExecState* exec, JSOb return jsUndefined(); } -JSValuePtr jsDOMApplicationCachePrototypeFunctionHasItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) -{ - if (!thisValue->isObject(&JSDOMApplicationCache::s_info)) - return throwError(exec, TypeError); - JSDOMApplicationCache* castedThisObj = static_cast<JSDOMApplicationCache*>(asObject(thisValue)); - return castedThisObj->hasItem(exec, args); -} - -JSValuePtr jsDOMApplicationCachePrototypeFunctionAdd(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) -{ - if (!thisValue->isObject(&JSDOMApplicationCache::s_info)) - return throwError(exec, TypeError); - JSDOMApplicationCache* castedThisObj = static_cast<JSDOMApplicationCache*>(asObject(thisValue)); - return castedThisObj->add(exec, args); -} - -JSValuePtr jsDOMApplicationCachePrototypeFunctionRemove(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) -{ - if (!thisValue->isObject(&JSDOMApplicationCache::s_info)) - return throwError(exec, TypeError); - JSDOMApplicationCache* castedThisObj = static_cast<JSDOMApplicationCache*>(asObject(thisValue)); - return castedThisObj->remove(exec, args); -} - -JSValuePtr jsDOMApplicationCachePrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMApplicationCachePrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMApplicationCache::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMApplicationCache::s_info)) return throwError(exec, TypeError); JSDOMApplicationCache* castedThisObj = static_cast<JSDOMApplicationCache*>(asObject(thisValue)); return castedThisObj->addEventListener(exec, args); } -JSValuePtr jsDOMApplicationCachePrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMApplicationCachePrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMApplicationCache::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMApplicationCache::s_info)) return throwError(exec, TypeError); JSDOMApplicationCache* castedThisObj = static_cast<JSDOMApplicationCache*>(asObject(thisValue)); return castedThisObj->removeEventListener(exec, args); } -JSValuePtr jsDOMApplicationCachePrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMApplicationCachePrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMApplicationCache::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMApplicationCache::s_info)) return throwError(exec, TypeError); JSDOMApplicationCache* castedThisObj = static_cast<JSDOMApplicationCache*>(asObject(thisValue)); DOMApplicationCache* imp = static_cast<DOMApplicationCache*>(castedThisObj->impl()); ExceptionCode ec = 0; - Event* evt = toEvent(args.at(exec, 0)); + Event* evt = toEvent(args.at(0)); - JSC::JSValuePtr result = jsBoolean(imp->dispatchEvent(evt, ec)); + JSC::JSValue result = jsBoolean(imp->dispatchEvent(evt, ec)); setDOMException(exec, ec); return result; } // Constant getters -JSValuePtr jsDOMApplicationCacheUNCACHED(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMApplicationCacheUNCACHED(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsDOMApplicationCacheIDLE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMApplicationCacheIDLE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsDOMApplicationCacheCHECKING(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMApplicationCacheCHECKING(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsDOMApplicationCacheDOWNLOADING(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMApplicationCacheDOWNLOADING(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsDOMApplicationCacheUPDATEREADY(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMApplicationCacheUPDATEREADY(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, DOMApplicationCache* object) +JSValue jsDOMApplicationCacheOBSOLETE(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(5)); +} + +JSC::JSValue toJS(JSC::ExecState* exec, DOMApplicationCache* object) { return getDOMObjectWrapper<JSDOMApplicationCache>(exec, object); } -DOMApplicationCache* toDOMApplicationCache(JSC::JSValuePtr value) +DOMApplicationCache* toDOMApplicationCache(JSC::JSValue value) { - return value->isObject(&JSDOMApplicationCache::s_info) ? static_cast<JSDOMApplicationCache*>(asObject(value))->impl() : 0; + return value.isObject(&JSDOMApplicationCache::s_info) ? static_cast<JSDOMApplicationCache*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMApplicationCache.h b/src/3rdparty/webkit/WebCore/generated/JSDOMApplicationCache.h index af5612e894..29f0c6412e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMApplicationCache.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMApplicationCache.h @@ -37,13 +37,13 @@ class JSDOMApplicationCache : public DOMObject { public: JSDOMApplicationCache(PassRefPtr<JSC::Structure>, PassRefPtr<DOMApplicationCache>); virtual ~JSDOMApplicationCache(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -52,27 +52,25 @@ public: // Custom functions - JSC::JSValuePtr hasItem(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr add(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr remove(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr addEventListener(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr removeEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue addEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue removeEventListener(JSC::ExecState*, const JSC::ArgList&); DOMApplicationCache* impl() const { return m_impl.get(); } private: RefPtr<DOMApplicationCache> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, DOMApplicationCache*); -DOMApplicationCache* toDOMApplicationCache(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, DOMApplicationCache*); +DOMApplicationCache* toDOMApplicationCache(JSC::JSValue); class JSDOMApplicationCachePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -81,39 +79,38 @@ public: // Functions -JSC::JSValuePtr jsDOMApplicationCachePrototypeFunctionUpdate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMApplicationCachePrototypeFunctionSwapCache(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMApplicationCachePrototypeFunctionHasItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMApplicationCachePrototypeFunctionAdd(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMApplicationCachePrototypeFunctionRemove(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMApplicationCachePrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMApplicationCachePrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMApplicationCachePrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMApplicationCachePrototypeFunctionUpdate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMApplicationCachePrototypeFunctionSwapCache(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMApplicationCachePrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMApplicationCachePrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMApplicationCachePrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsDOMApplicationCacheStatus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMApplicationCacheItems(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMApplicationCacheOnchecking(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMApplicationCacheOnchecking(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMApplicationCacheOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMApplicationCacheOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMApplicationCacheOnnoupdate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMApplicationCacheOnnoupdate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMApplicationCacheOndownloading(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMApplicationCacheOndownloading(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMApplicationCacheOnprogress(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMApplicationCacheOnprogress(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMApplicationCacheOnupdateready(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMApplicationCacheOnupdateready(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMApplicationCacheOncached(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMApplicationCacheOncached(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsDOMApplicationCacheStatus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMApplicationCacheOnchecking(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMApplicationCacheOnchecking(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMApplicationCacheOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMApplicationCacheOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMApplicationCacheOnnoupdate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMApplicationCacheOnnoupdate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMApplicationCacheOndownloading(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMApplicationCacheOndownloading(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMApplicationCacheOnprogress(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMApplicationCacheOnprogress(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMApplicationCacheOnupdateready(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMApplicationCacheOnupdateready(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMApplicationCacheOncached(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMApplicationCacheOncached(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMApplicationCacheOnobsolete(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMApplicationCacheOnobsolete(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); // Constants -JSC::JSValuePtr jsDOMApplicationCacheUNCACHED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMApplicationCacheIDLE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMApplicationCacheCHECKING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMApplicationCacheDOWNLOADING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMApplicationCacheUPDATEREADY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMApplicationCacheUNCACHED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMApplicationCacheIDLE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMApplicationCacheCHECKING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMApplicationCacheDOWNLOADING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMApplicationCacheUPDATEREADY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMApplicationCacheOBSOLETE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMCoreException.cpp b/src/3rdparty/webkit/WebCore/generated/JSDOMCoreException.cpp index 87b6ce49ed..9cbb5398a6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMCoreException.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMCoreException.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSDOMCoreException) +ASSERT_CLASS_FITS_IN_CELL(JSDOMCoreException); /* Hash table */ @@ -57,7 +57,7 @@ static const HashTable JSDOMCoreExceptionTable = /* Hash table for constructor */ -static const HashTableValue JSDOMCoreExceptionConstructorTableValues[18] = +static const HashTableValue JSDOMCoreExceptionConstructorTableValues[23] = { { "INDEX_SIZE_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionINDEX_SIZE_ERR, (intptr_t)0 }, { "DOMSTRING_SIZE_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionDOMSTRING_SIZE_ERR, (intptr_t)0 }, @@ -76,6 +76,11 @@ static const HashTableValue JSDOMCoreExceptionConstructorTableValues[18] = { "INVALID_ACCESS_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionINVALID_ACCESS_ERR, (intptr_t)0 }, { "VALIDATION_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionVALIDATION_ERR, (intptr_t)0 }, { "TYPE_MISMATCH_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionTYPE_MISMATCH_ERR, (intptr_t)0 }, + { "SECURITY_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionSECURITY_ERR, (intptr_t)0 }, + { "NETWORK_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionNETWORK_ERR, (intptr_t)0 }, + { "ABORT_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionABORT_ERR, (intptr_t)0 }, + { "URL_MISMATCH_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionURL_MISMATCH_ERR, (intptr_t)0 }, + { "QUOTA_EXCEEDED_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionQUOTA_EXCEEDED_ERR, (intptr_t)0 }, { 0, 0, 0, 0 } }; @@ -91,13 +96,13 @@ public: JSDOMCoreExceptionConstructor(ExecState* exec) : DOMObject(JSDOMCoreExceptionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSDOMCoreExceptionPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSDOMCoreExceptionPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -112,7 +117,7 @@ bool JSDOMCoreExceptionConstructor::getOwnPropertySlot(ExecState* exec, const Id /* Hash table for prototype */ -static const HashTableValue JSDOMCoreExceptionPrototypeTableValues[19] = +static const HashTableValue JSDOMCoreExceptionPrototypeTableValues[24] = { { "INDEX_SIZE_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionINDEX_SIZE_ERR, (intptr_t)0 }, { "DOMSTRING_SIZE_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionDOMSTRING_SIZE_ERR, (intptr_t)0 }, @@ -131,6 +136,11 @@ static const HashTableValue JSDOMCoreExceptionPrototypeTableValues[19] = { "INVALID_ACCESS_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionINVALID_ACCESS_ERR, (intptr_t)0 }, { "VALIDATION_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionVALIDATION_ERR, (intptr_t)0 }, { "TYPE_MISMATCH_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionTYPE_MISMATCH_ERR, (intptr_t)0 }, + { "SECURITY_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionSECURITY_ERR, (intptr_t)0 }, + { "NETWORK_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionNETWORK_ERR, (intptr_t)0 }, + { "ABORT_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionABORT_ERR, (intptr_t)0 }, + { "URL_MISMATCH_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionURL_MISMATCH_ERR, (intptr_t)0 }, + { "QUOTA_EXCEEDED_ERR", DontDelete|ReadOnly, (intptr_t)jsDOMCoreExceptionQUOTA_EXCEEDED_ERR, (intptr_t)0 }, { "toString", DontDelete|DontEnum|Function, (intptr_t)jsDOMCoreExceptionPrototypeFunctionToString, (intptr_t)0 }, { 0, 0, 0, 0 } }; @@ -139,14 +149,14 @@ static const HashTable JSDOMCoreExceptionPrototypeTable = #if ENABLE(PERFECT_HASH_SIZE) { 511, JSDOMCoreExceptionPrototypeTableValues, 0 }; #else - { 67, 63, JSDOMCoreExceptionPrototypeTableValues, 0 }; + { 68, 63, JSDOMCoreExceptionPrototypeTableValues, 0 }; #endif const ClassInfo JSDOMCoreExceptionPrototype::s_info = { "DOMExceptionPrototype", 0, &JSDOMCoreExceptionPrototypeTable, 0 }; -JSObject* JSDOMCoreExceptionPrototype::self(ExecState* exec) +JSObject* JSDOMCoreExceptionPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSDOMCoreException>(exec); + return getDOMPrototype<JSDOMCoreException>(exec, globalObject); } bool JSDOMCoreExceptionPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -165,12 +175,11 @@ JSDOMCoreException::JSDOMCoreException(PassRefPtr<Structure> structure, PassRefP JSDOMCoreException::~JSDOMCoreException() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSDOMCoreException::createPrototype(ExecState* exec) +JSObject* JSDOMCoreException::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSDOMCoreExceptionPrototype(JSDOMCoreExceptionPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSDOMCoreExceptionPrototype(JSDOMCoreExceptionPrototype::createStructure(globalObject->objectPrototype())); } bool JSDOMCoreException::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -178,139 +187,168 @@ bool JSDOMCoreException::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSDOMCoreException, Base>(exec, &JSDOMCoreExceptionTable, this, propertyName, slot); } -JSValuePtr jsDOMCoreExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMCoreExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMCoreException* imp = static_cast<DOMCoreException*>(static_cast<JSDOMCoreException*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->code()); } -JSValuePtr jsDOMCoreExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMCoreExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMCoreException* imp = static_cast<DOMCoreException*>(static_cast<JSDOMCoreException*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsDOMCoreExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMCoreExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMCoreException* imp = static_cast<DOMCoreException*>(static_cast<JSDOMCoreException*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->message()); } -JSValuePtr jsDOMCoreExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMCoreExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSDOMCoreException*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSDOMCoreException::getConstructor(ExecState* exec) +JSValue JSDOMCoreException::getConstructor(ExecState* exec) { return getDOMConstructor<JSDOMCoreExceptionConstructor>(exec); } -JSValuePtr jsDOMCoreExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMCoreExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMCoreException::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMCoreException::s_info)) return throwError(exec, TypeError); JSDOMCoreException* castedThisObj = static_cast<JSDOMCoreException*>(asObject(thisValue)); DOMCoreException* imp = static_cast<DOMCoreException*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsString(exec, imp->toString()); + JSC::JSValue result = jsString(exec, imp->toString()); return result; } // Constant getters -JSValuePtr jsDOMCoreExceptionINDEX_SIZE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionINDEX_SIZE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsDOMCoreExceptionDOMSTRING_SIZE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionDOMSTRING_SIZE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsDOMCoreExceptionHIERARCHY_REQUEST_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionHIERARCHY_REQUEST_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsDOMCoreExceptionWRONG_DOCUMENT_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionWRONG_DOCUMENT_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSValuePtr jsDOMCoreExceptionINVALID_CHARACTER_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionINVALID_CHARACTER_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(5)); } -JSValuePtr jsDOMCoreExceptionNO_DATA_ALLOWED_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionNO_DATA_ALLOWED_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(6)); } -JSValuePtr jsDOMCoreExceptionNO_MODIFICATION_ALLOWED_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionNO_MODIFICATION_ALLOWED_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(7)); } -JSValuePtr jsDOMCoreExceptionNOT_FOUND_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionNOT_FOUND_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(8)); } -JSValuePtr jsDOMCoreExceptionNOT_SUPPORTED_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionNOT_SUPPORTED_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(9)); } -JSValuePtr jsDOMCoreExceptionINUSE_ATTRIBUTE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionINUSE_ATTRIBUTE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(10)); } -JSValuePtr jsDOMCoreExceptionINVALID_STATE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionINVALID_STATE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(11)); } -JSValuePtr jsDOMCoreExceptionSYNTAX_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionSYNTAX_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(12)); } -JSValuePtr jsDOMCoreExceptionINVALID_MODIFICATION_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionINVALID_MODIFICATION_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(13)); } -JSValuePtr jsDOMCoreExceptionNAMESPACE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionNAMESPACE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(14)); } -JSValuePtr jsDOMCoreExceptionINVALID_ACCESS_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionINVALID_ACCESS_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(15)); } -JSValuePtr jsDOMCoreExceptionVALIDATION_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionVALIDATION_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(16)); } -JSValuePtr jsDOMCoreExceptionTYPE_MISMATCH_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsDOMCoreExceptionTYPE_MISMATCH_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(17)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, DOMCoreException* object) +JSValue jsDOMCoreExceptionSECURITY_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(18)); +} + +JSValue jsDOMCoreExceptionNETWORK_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(19)); +} + +JSValue jsDOMCoreExceptionABORT_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(20)); +} + +JSValue jsDOMCoreExceptionURL_MISMATCH_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(21)); +} + +JSValue jsDOMCoreExceptionQUOTA_EXCEEDED_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(22)); +} + +JSC::JSValue toJS(JSC::ExecState* exec, DOMCoreException* object) { return getDOMObjectWrapper<JSDOMCoreException>(exec, object); } -DOMCoreException* toDOMCoreException(JSC::JSValuePtr value) +DOMCoreException* toDOMCoreException(JSC::JSValue value) { - return value->isObject(&JSDOMCoreException::s_info) ? static_cast<JSDOMCoreException*>(asObject(value))->impl() : 0; + return value.isObject(&JSDOMCoreException::s_info) ? static_cast<JSDOMCoreException*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMCoreException.h b/src/3rdparty/webkit/WebCore/generated/JSDOMCoreException.h index e5d9b39fad..75b43284eb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMCoreException.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMCoreException.h @@ -34,33 +34,34 @@ class JSDOMCoreException : public DOMObject { public: JSDOMCoreException(PassRefPtr<JSC::Structure>, PassRefPtr<DOMCoreException>); virtual ~JSDOMCoreException(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); DOMCoreException* impl() const { return m_impl.get(); } private: RefPtr<DOMCoreException> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, DOMCoreException*); -DOMCoreException* toDOMCoreException(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, DOMCoreException*); +DOMCoreException* toDOMCoreException(JSC::JSValue); class JSDOMCoreExceptionPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -69,32 +70,37 @@ public: // Functions -JSC::JSValuePtr jsDOMCoreExceptionPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMCoreExceptionPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsDOMCoreExceptionCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsDOMCoreExceptionINDEX_SIZE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionDOMSTRING_SIZE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionHIERARCHY_REQUEST_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionWRONG_DOCUMENT_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionINVALID_CHARACTER_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionNO_DATA_ALLOWED_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionNO_MODIFICATION_ALLOWED_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionNOT_FOUND_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionNOT_SUPPORTED_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionINUSE_ATTRIBUTE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionINVALID_STATE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionSYNTAX_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionINVALID_MODIFICATION_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionNAMESPACE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionINVALID_ACCESS_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionVALIDATION_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMCoreExceptionTYPE_MISMATCH_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionINDEX_SIZE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionDOMSTRING_SIZE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionHIERARCHY_REQUEST_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionWRONG_DOCUMENT_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionINVALID_CHARACTER_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionNO_DATA_ALLOWED_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionNO_MODIFICATION_ALLOWED_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionNOT_FOUND_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionNOT_SUPPORTED_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionINUSE_ATTRIBUTE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionINVALID_STATE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionSYNTAX_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionINVALID_MODIFICATION_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionNAMESPACE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionINVALID_ACCESS_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionVALIDATION_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionTYPE_MISMATCH_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionSECURITY_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionNETWORK_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionABORT_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionURL_MISMATCH_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMCoreExceptionQUOTA_EXCEEDED_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMImplementation.cpp b/src/3rdparty/webkit/WebCore/generated/JSDOMImplementation.cpp index 76d00a89fc..f676df6251 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMImplementation.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMImplementation.cpp @@ -42,7 +42,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSDOMImplementation) +ASSERT_CLASS_FITS_IN_CELL(JSDOMImplementation); /* Hash table */ @@ -78,13 +78,13 @@ public: JSDOMImplementationConstructor(ExecState* exec) : DOMObject(JSDOMImplementationConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSDOMImplementationPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSDOMImplementationPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -118,9 +118,9 @@ static const HashTable JSDOMImplementationPrototypeTable = const ClassInfo JSDOMImplementationPrototype::s_info = { "DOMImplementationPrototype", 0, &JSDOMImplementationPrototypeTable, 0 }; -JSObject* JSDOMImplementationPrototype::self(ExecState* exec) +JSObject* JSDOMImplementationPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSDOMImplementation>(exec); + return getDOMPrototype<JSDOMImplementation>(exec, globalObject); } bool JSDOMImplementationPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -139,12 +139,11 @@ JSDOMImplementation::JSDOMImplementation(PassRefPtr<Structure> structure, PassRe JSDOMImplementation::~JSDOMImplementation() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSDOMImplementation::createPrototype(ExecState* exec) +JSObject* JSDOMImplementation::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSDOMImplementationPrototype(JSDOMImplementationPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSDOMImplementationPrototype(JSDOMImplementationPrototype::createStructure(globalObject->objectPrototype())); } bool JSDOMImplementation::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -152,99 +151,104 @@ bool JSDOMImplementation::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSDOMImplementation, Base>(exec, &JSDOMImplementationTable, this, propertyName, slot); } -JSValuePtr jsDOMImplementationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMImplementationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSDOMImplementation*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSDOMImplementation::getConstructor(ExecState* exec) +JSValue JSDOMImplementation::getConstructor(ExecState* exec) { return getDOMConstructor<JSDOMImplementationConstructor>(exec); } -JSValuePtr jsDOMImplementationPrototypeFunctionHasFeature(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMImplementationPrototypeFunctionHasFeature(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMImplementation::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMImplementation::s_info)) return throwError(exec, TypeError); JSDOMImplementation* castedThisObj = static_cast<JSDOMImplementation*>(asObject(thisValue)); DOMImplementation* imp = static_cast<DOMImplementation*>(castedThisObj->impl()); - const UString& feature = args.at(exec, 0)->toString(exec); - const UString& version = valueToStringWithNullCheck(exec, args.at(exec, 1)); + const UString& feature = args.at(0).toString(exec); + const UString& version = valueToStringWithNullCheck(exec, args.at(1)); - JSC::JSValuePtr result = jsBoolean(imp->hasFeature(feature, version)); + JSC::JSValue result = jsBoolean(imp->hasFeature(feature, version)); return result; } -JSValuePtr jsDOMImplementationPrototypeFunctionCreateDocumentType(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMImplementationPrototypeFunctionCreateDocumentType(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMImplementation::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMImplementation::s_info)) return throwError(exec, TypeError); JSDOMImplementation* castedThisObj = static_cast<JSDOMImplementation*>(asObject(thisValue)); DOMImplementation* imp = static_cast<DOMImplementation*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& qualifiedName = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 0)); - const UString& publicId = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 1)); - const UString& systemId = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 2)); + const UString& qualifiedName = valueToStringWithUndefinedOrNullCheck(exec, args.at(0)); + const UString& publicId = valueToStringWithUndefinedOrNullCheck(exec, args.at(1)); + const UString& systemId = valueToStringWithUndefinedOrNullCheck(exec, args.at(2)); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createDocumentType(qualifiedName, publicId, systemId, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createDocumentType(qualifiedName, publicId, systemId, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDOMImplementationPrototypeFunctionCreateDocument(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMImplementationPrototypeFunctionCreateDocument(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMImplementation::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMImplementation::s_info)) return throwError(exec, TypeError); JSDOMImplementation* castedThisObj = static_cast<JSDOMImplementation*>(asObject(thisValue)); DOMImplementation* imp = static_cast<DOMImplementation*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(exec, 0)); - const UString& qualifiedName = valueToStringWithNullCheck(exec, args.at(exec, 1)); - DocumentType* doctype = toDocumentType(args.at(exec, 2)); + const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(0)); + const UString& qualifiedName = valueToStringWithNullCheck(exec, args.at(1)); + DocumentType* doctype = toDocumentType(args.at(2)); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createDocument(namespaceURI, qualifiedName, doctype, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createDocument(namespaceURI, qualifiedName, doctype, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDOMImplementationPrototypeFunctionCreateCSSStyleSheet(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMImplementationPrototypeFunctionCreateCSSStyleSheet(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMImplementation::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMImplementation::s_info)) return throwError(exec, TypeError); JSDOMImplementation* castedThisObj = static_cast<JSDOMImplementation*>(asObject(thisValue)); DOMImplementation* imp = static_cast<DOMImplementation*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& title = args.at(exec, 0)->toString(exec); - const UString& media = args.at(exec, 1)->toString(exec); + const UString& title = args.at(0).toString(exec); + const UString& media = args.at(1).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createCSSStyleSheet(title, media, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createCSSStyleSheet(title, media, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDOMImplementationPrototypeFunctionCreateHTMLDocument(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMImplementationPrototypeFunctionCreateHTMLDocument(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMImplementation::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMImplementation::s_info)) return throwError(exec, TypeError); JSDOMImplementation* castedThisObj = static_cast<JSDOMImplementation*>(asObject(thisValue)); DOMImplementation* imp = static_cast<DOMImplementation*>(castedThisObj->impl()); - const UString& title = args.at(exec, 0)->toString(exec); + const UString& title = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createHTMLDocument(title))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createHTMLDocument(title))); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, DOMImplementation* object) +JSC::JSValue toJS(JSC::ExecState* exec, DOMImplementation* object) { return getDOMObjectWrapper<JSDOMImplementation>(exec, object); } -DOMImplementation* toDOMImplementation(JSC::JSValuePtr value) +DOMImplementation* toDOMImplementation(JSC::JSValue value) { - return value->isObject(&JSDOMImplementation::s_info) ? static_cast<JSDOMImplementation*>(asObject(value))->impl() : 0; + return value.isObject(&JSDOMImplementation::s_info) ? static_cast<JSDOMImplementation*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMImplementation.h b/src/3rdparty/webkit/WebCore/generated/JSDOMImplementation.h index 72fd40f076..e0177782ef 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMImplementation.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMImplementation.h @@ -34,33 +34,34 @@ class JSDOMImplementation : public DOMObject { public: JSDOMImplementation(PassRefPtr<JSC::Structure>, PassRefPtr<DOMImplementation>); virtual ~JSDOMImplementation(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); DOMImplementation* impl() const { return m_impl.get(); } private: RefPtr<DOMImplementation> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, DOMImplementation*); -DOMImplementation* toDOMImplementation(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, DOMImplementation*); +DOMImplementation* toDOMImplementation(JSC::JSValue); class JSDOMImplementationPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -69,14 +70,14 @@ public: // Functions -JSC::JSValuePtr jsDOMImplementationPrototypeFunctionHasFeature(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMImplementationPrototypeFunctionCreateDocumentType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMImplementationPrototypeFunctionCreateDocument(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMImplementationPrototypeFunctionCreateCSSStyleSheet(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMImplementationPrototypeFunctionCreateHTMLDocument(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMImplementationPrototypeFunctionHasFeature(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMImplementationPrototypeFunctionCreateDocumentType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMImplementationPrototypeFunctionCreateDocument(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMImplementationPrototypeFunctionCreateCSSStyleSheet(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMImplementationPrototypeFunctionCreateHTMLDocument(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsDOMImplementationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMImplementationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMParser.cpp b/src/3rdparty/webkit/WebCore/generated/JSDOMParser.cpp index 162127ce90..7050472a55 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMParser.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMParser.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSDOMParser) +ASSERT_CLASS_FITS_IN_CELL(JSDOMParser); /* Hash table */ @@ -72,13 +72,13 @@ public: JSDOMParserConstructor(ExecState* exec) : DOMObject(JSDOMParserConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSDOMParserPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSDOMParserPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -117,9 +117,9 @@ static const HashTable JSDOMParserPrototypeTable = const ClassInfo JSDOMParserPrototype::s_info = { "DOMParserPrototype", 0, &JSDOMParserPrototypeTable, 0 }; -JSObject* JSDOMParserPrototype::self(ExecState* exec) +JSObject* JSDOMParserPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSDOMParser>(exec); + return getDOMPrototype<JSDOMParser>(exec, globalObject); } bool JSDOMParserPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -138,12 +138,11 @@ JSDOMParser::JSDOMParser(PassRefPtr<Structure> structure, PassRefPtr<DOMParser> JSDOMParser::~JSDOMParser() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSDOMParser::createPrototype(ExecState* exec) +JSObject* JSDOMParser::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSDOMParserPrototype(JSDOMParserPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSDOMParserPrototype(JSDOMParserPrototype::createStructure(globalObject->objectPrototype())); } bool JSDOMParser::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -151,36 +150,37 @@ bool JSDOMParser::getOwnPropertySlot(ExecState* exec, const Identifier& property return getStaticValueSlot<JSDOMParser, Base>(exec, &JSDOMParserTable, this, propertyName, slot); } -JSValuePtr jsDOMParserConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMParserConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSDOMParser*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSDOMParser::getConstructor(ExecState* exec) +JSValue JSDOMParser::getConstructor(ExecState* exec) { return getDOMConstructor<JSDOMParserConstructor>(exec); } -JSValuePtr jsDOMParserPrototypeFunctionParseFromString(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMParserPrototypeFunctionParseFromString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMParser::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMParser::s_info)) return throwError(exec, TypeError); JSDOMParser* castedThisObj = static_cast<JSDOMParser*>(asObject(thisValue)); DOMParser* imp = static_cast<DOMParser*>(castedThisObj->impl()); - const UString& str = args.at(exec, 0)->toString(exec); - const UString& contentType = args.at(exec, 1)->toString(exec); + const UString& str = args.at(0).toString(exec); + const UString& contentType = args.at(1).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->parseFromString(str, contentType))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->parseFromString(str, contentType))); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, DOMParser* object) +JSC::JSValue toJS(JSC::ExecState* exec, DOMParser* object) { return getDOMObjectWrapper<JSDOMParser>(exec, object); } -DOMParser* toDOMParser(JSC::JSValuePtr value) +DOMParser* toDOMParser(JSC::JSValue value) { - return value->isObject(&JSDOMParser::s_info) ? static_cast<JSDOMParser*>(asObject(value))->impl() : 0; + return value.isObject(&JSDOMParser::s_info) ? static_cast<JSDOMParser*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMParser.h b/src/3rdparty/webkit/WebCore/generated/JSDOMParser.h index 0e2b6041a0..cfdbe9b2a1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMParser.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMParser.h @@ -34,33 +34,34 @@ class JSDOMParser : public DOMObject { public: JSDOMParser(PassRefPtr<JSC::Structure>, PassRefPtr<DOMParser>); virtual ~JSDOMParser(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); DOMParser* impl() const { return m_impl.get(); } private: RefPtr<DOMParser> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, DOMParser*); -DOMParser* toDOMParser(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, DOMParser*); +DOMParser* toDOMParser(JSC::JSValue); class JSDOMParserPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -69,10 +70,10 @@ public: // Functions -JSC::JSValuePtr jsDOMParserPrototypeFunctionParseFromString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMParserPrototypeFunctionParseFromString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsDOMParserConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMParserConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMSelection.cpp b/src/3rdparty/webkit/WebCore/generated/JSDOMSelection.cpp index 48f575c482..6ea1bad7b2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMSelection.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMSelection.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSDOMSelection) +ASSERT_CLASS_FITS_IN_CELL(JSDOMSelection); /* Hash table */ @@ -49,13 +49,13 @@ static const HashTableValue JSDOMSelectionTableValues[12] = { "anchorOffset", DontDelete|ReadOnly, (intptr_t)jsDOMSelectionAnchorOffset, (intptr_t)0 }, { "focusNode", DontDelete|ReadOnly, (intptr_t)jsDOMSelectionFocusNode, (intptr_t)0 }, { "focusOffset", DontDelete|ReadOnly, (intptr_t)jsDOMSelectionFocusOffset, (intptr_t)0 }, + { "isCollapsed", DontDelete|ReadOnly, (intptr_t)jsDOMSelectionIsCollapsed, (intptr_t)0 }, + { "rangeCount", DontDelete|ReadOnly, (intptr_t)jsDOMSelectionRangeCount, (intptr_t)0 }, { "baseNode", DontDelete|ReadOnly, (intptr_t)jsDOMSelectionBaseNode, (intptr_t)0 }, { "baseOffset", DontDelete|ReadOnly, (intptr_t)jsDOMSelectionBaseOffset, (intptr_t)0 }, { "extentNode", DontDelete|ReadOnly, (intptr_t)jsDOMSelectionExtentNode, (intptr_t)0 }, { "extentOffset", DontDelete|ReadOnly, (intptr_t)jsDOMSelectionExtentOffset, (intptr_t)0 }, - { "isCollapsed", DontDelete|ReadOnly, (intptr_t)jsDOMSelectionIsCollapsed, (intptr_t)0 }, { "type", DontDelete|ReadOnly, (intptr_t)jsDOMSelectionType, (intptr_t)0 }, - { "rangeCount", DontDelete|ReadOnly, (intptr_t)jsDOMSelectionRangeCount, (intptr_t)0 }, { 0, 0, 0, 0 } }; @@ -76,15 +76,15 @@ static const HashTableValue JSDOMSelectionPrototypeTableValues[16] = { "deleteFromDocument", DontDelete|Function, (intptr_t)jsDOMSelectionPrototypeFunctionDeleteFromDocument, (intptr_t)0 }, { "containsNode", DontDelete|Function, (intptr_t)jsDOMSelectionPrototypeFunctionContainsNode, (intptr_t)2 }, { "selectAllChildren", DontDelete|Function, (intptr_t)jsDOMSelectionPrototypeFunctionSelectAllChildren, (intptr_t)1 }, - { "empty", DontDelete|Function, (intptr_t)jsDOMSelectionPrototypeFunctionEmpty, (intptr_t)0 }, - { "setBaseAndExtent", DontDelete|Function, (intptr_t)jsDOMSelectionPrototypeFunctionSetBaseAndExtent, (intptr_t)4 }, - { "setPosition", DontDelete|Function, (intptr_t)jsDOMSelectionPrototypeFunctionSetPosition, (intptr_t)2 }, - { "modify", DontDelete|Function, (intptr_t)jsDOMSelectionPrototypeFunctionModify, (intptr_t)3 }, { "extend", DontDelete|Function, (intptr_t)jsDOMSelectionPrototypeFunctionExtend, (intptr_t)2 }, { "getRangeAt", DontDelete|Function, (intptr_t)jsDOMSelectionPrototypeFunctionGetRangeAt, (intptr_t)1 }, { "removeAllRanges", DontDelete|Function, (intptr_t)jsDOMSelectionPrototypeFunctionRemoveAllRanges, (intptr_t)0 }, { "addRange", DontDelete|Function, (intptr_t)jsDOMSelectionPrototypeFunctionAddRange, (intptr_t)1 }, { "toString", DontDelete|DontEnum|Function, (intptr_t)jsDOMSelectionPrototypeFunctionToString, (intptr_t)0 }, + { "modify", DontDelete|Function, (intptr_t)jsDOMSelectionPrototypeFunctionModify, (intptr_t)3 }, + { "setBaseAndExtent", DontDelete|Function, (intptr_t)jsDOMSelectionPrototypeFunctionSetBaseAndExtent, (intptr_t)4 }, + { "setPosition", DontDelete|Function, (intptr_t)jsDOMSelectionPrototypeFunctionSetPosition, (intptr_t)2 }, + { "empty", DontDelete|Function, (intptr_t)jsDOMSelectionPrototypeFunctionEmpty, (intptr_t)0 }, { 0, 0, 0, 0 } }; @@ -97,9 +97,9 @@ static const HashTable JSDOMSelectionPrototypeTable = const ClassInfo JSDOMSelectionPrototype::s_info = { "DOMSelectionPrototype", 0, &JSDOMSelectionPrototypeTable, 0 }; -JSObject* JSDOMSelectionPrototype::self(ExecState* exec) +JSObject* JSDOMSelectionPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSDOMSelection>(exec); + return getDOMPrototype<JSDOMSelection>(exec, globalObject); } bool JSDOMSelectionPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -118,12 +118,11 @@ JSDOMSelection::JSDOMSelection(PassRefPtr<Structure> structure, PassRefPtr<DOMSe JSDOMSelection::~JSDOMSelection() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSDOMSelection::createPrototype(ExecState* exec) +JSObject* JSDOMSelection::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSDOMSelectionPrototype(JSDOMSelectionPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSDOMSelectionPrototype(JSDOMSelectionPrototype::createStructure(globalObject->objectPrototype())); } bool JSDOMSelection::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -131,90 +130,103 @@ bool JSDOMSelection::getOwnPropertySlot(ExecState* exec, const Identifier& prope return getStaticValueSlot<JSDOMSelection, Base>(exec, &JSDOMSelectionTable, this, propertyName, slot); } -JSValuePtr jsDOMSelectionAnchorNode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMSelectionAnchorNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMSelection* imp = static_cast<DOMSelection*>(static_cast<JSDOMSelection*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->anchorNode())); } -JSValuePtr jsDOMSelectionAnchorOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMSelectionAnchorOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMSelection* imp = static_cast<DOMSelection*>(static_cast<JSDOMSelection*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->anchorOffset()); } -JSValuePtr jsDOMSelectionFocusNode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMSelectionFocusNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMSelection* imp = static_cast<DOMSelection*>(static_cast<JSDOMSelection*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->focusNode())); } -JSValuePtr jsDOMSelectionFocusOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMSelectionFocusOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMSelection* imp = static_cast<DOMSelection*>(static_cast<JSDOMSelection*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->focusOffset()); } -JSValuePtr jsDOMSelectionBaseNode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMSelectionIsCollapsed(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMSelection* imp = static_cast<DOMSelection*>(static_cast<JSDOMSelection*>(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->baseNode())); + return jsBoolean(imp->isCollapsed()); } -JSValuePtr jsDOMSelectionBaseOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMSelectionRangeCount(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMSelection* imp = static_cast<DOMSelection*>(static_cast<JSDOMSelection*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->baseOffset()); + return jsNumber(exec, imp->rangeCount()); } -JSValuePtr jsDOMSelectionExtentNode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMSelectionBaseNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMSelection* imp = static_cast<DOMSelection*>(static_cast<JSDOMSelection*>(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->extentNode())); + return toJS(exec, WTF::getPtr(imp->baseNode())); } -JSValuePtr jsDOMSelectionExtentOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMSelectionBaseOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMSelection* imp = static_cast<DOMSelection*>(static_cast<JSDOMSelection*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->extentOffset()); + return jsNumber(exec, imp->baseOffset()); } -JSValuePtr jsDOMSelectionIsCollapsed(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMSelectionExtentNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMSelection* imp = static_cast<DOMSelection*>(static_cast<JSDOMSelection*>(asObject(slot.slotBase()))->impl()); - return jsBoolean(imp->isCollapsed()); + return toJS(exec, WTF::getPtr(imp->extentNode())); } -JSValuePtr jsDOMSelectionType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMSelectionExtentOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMSelection* imp = static_cast<DOMSelection*>(static_cast<JSDOMSelection*>(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->type()); + return jsNumber(exec, imp->extentOffset()); } -JSValuePtr jsDOMSelectionRangeCount(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMSelectionType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMSelection* imp = static_cast<DOMSelection*>(static_cast<JSDOMSelection*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->rangeCount()); + return jsString(exec, imp->type()); } -JSValuePtr jsDOMSelectionPrototypeFunctionCollapse(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionCollapse(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMSelection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMSelection::s_info)) return throwError(exec, TypeError); JSDOMSelection* castedThisObj = static_cast<JSDOMSelection*>(asObject(thisValue)); DOMSelection* imp = static_cast<DOMSelection*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* node = toNode(args.at(exec, 0)); - int index = args.at(exec, 1)->toInt32(exec); + Node* node = toNode(args.at(0)); + int index = args.at(1).toInt32(exec); imp->collapse(node, index, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsDOMSelectionPrototypeFunctionCollapseToEnd(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionCollapseToEnd(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMSelection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMSelection::s_info)) return throwError(exec, TypeError); JSDOMSelection* castedThisObj = static_cast<JSDOMSelection*>(asObject(thisValue)); DOMSelection* imp = static_cast<DOMSelection*>(castedThisObj->impl()); @@ -223,9 +235,10 @@ JSValuePtr jsDOMSelectionPrototypeFunctionCollapseToEnd(ExecState* exec, JSObjec return jsUndefined(); } -JSValuePtr jsDOMSelectionPrototypeFunctionCollapseToStart(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionCollapseToStart(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMSelection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMSelection::s_info)) return throwError(exec, TypeError); JSDOMSelection* castedThisObj = static_cast<JSDOMSelection*>(asObject(thisValue)); DOMSelection* imp = static_cast<DOMSelection*>(castedThisObj->impl()); @@ -234,9 +247,10 @@ JSValuePtr jsDOMSelectionPrototypeFunctionCollapseToStart(ExecState* exec, JSObj return jsUndefined(); } -JSValuePtr jsDOMSelectionPrototypeFunctionDeleteFromDocument(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionDeleteFromDocument(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMSelection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMSelection::s_info)) return throwError(exec, TypeError); JSDOMSelection* castedThisObj = static_cast<JSDOMSelection*>(asObject(thisValue)); DOMSelection* imp = static_cast<DOMSelection*>(castedThisObj->impl()); @@ -245,163 +259,174 @@ JSValuePtr jsDOMSelectionPrototypeFunctionDeleteFromDocument(ExecState* exec, JS return jsUndefined(); } -JSValuePtr jsDOMSelectionPrototypeFunctionContainsNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionContainsNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMSelection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMSelection::s_info)) return throwError(exec, TypeError); JSDOMSelection* castedThisObj = static_cast<JSDOMSelection*>(asObject(thisValue)); DOMSelection* imp = static_cast<DOMSelection*>(castedThisObj->impl()); - Node* node = toNode(args.at(exec, 0)); - bool allowPartial = args.at(exec, 1)->toBoolean(exec); + Node* node = toNode(args.at(0)); + bool allowPartial = args.at(1).toBoolean(exec); - JSC::JSValuePtr result = jsBoolean(imp->containsNode(node, allowPartial)); + JSC::JSValue result = jsBoolean(imp->containsNode(node, allowPartial)); return result; } -JSValuePtr jsDOMSelectionPrototypeFunctionSelectAllChildren(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionSelectAllChildren(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMSelection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMSelection::s_info)) return throwError(exec, TypeError); JSDOMSelection* castedThisObj = static_cast<JSDOMSelection*>(asObject(thisValue)); DOMSelection* imp = static_cast<DOMSelection*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* node = toNode(args.at(exec, 0)); + Node* node = toNode(args.at(0)); imp->selectAllChildren(node, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsDOMSelectionPrototypeFunctionEmpty(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionExtend(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMSelection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMSelection::s_info)) return throwError(exec, TypeError); JSDOMSelection* castedThisObj = static_cast<JSDOMSelection*>(asObject(thisValue)); DOMSelection* imp = static_cast<DOMSelection*>(castedThisObj->impl()); + ExceptionCode ec = 0; + Node* node = toNode(args.at(0)); + int offset = args.at(1).toInt32(exec); - imp->empty(); + imp->extend(node, offset, ec); + setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsDOMSelectionPrototypeFunctionSetBaseAndExtent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionGetRangeAt(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMSelection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMSelection::s_info)) return throwError(exec, TypeError); JSDOMSelection* castedThisObj = static_cast<JSDOMSelection*>(asObject(thisValue)); DOMSelection* imp = static_cast<DOMSelection*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* baseNode = toNode(args.at(exec, 0)); - int baseOffset = args.at(exec, 1)->toInt32(exec); - Node* extentNode = toNode(args.at(exec, 2)); - int extentOffset = args.at(exec, 3)->toInt32(exec); + int index = args.at(0).toInt32(exec); - imp->setBaseAndExtent(baseNode, baseOffset, extentNode, extentOffset, ec); + + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getRangeAt(index, ec))); setDOMException(exec, ec); - return jsUndefined(); + return result; } -JSValuePtr jsDOMSelectionPrototypeFunctionSetPosition(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionRemoveAllRanges(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMSelection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMSelection::s_info)) return throwError(exec, TypeError); JSDOMSelection* castedThisObj = static_cast<JSDOMSelection*>(asObject(thisValue)); DOMSelection* imp = static_cast<DOMSelection*>(castedThisObj->impl()); - ExceptionCode ec = 0; - Node* node = toNode(args.at(exec, 0)); - int offset = args.at(exec, 1)->toInt32(exec); - imp->setPosition(node, offset, ec); - setDOMException(exec, ec); + imp->removeAllRanges(); return jsUndefined(); } -JSValuePtr jsDOMSelectionPrototypeFunctionModify(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionAddRange(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMSelection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMSelection::s_info)) return throwError(exec, TypeError); JSDOMSelection* castedThisObj = static_cast<JSDOMSelection*>(asObject(thisValue)); DOMSelection* imp = static_cast<DOMSelection*>(castedThisObj->impl()); - const UString& alter = args.at(exec, 0)->toString(exec); - const UString& direction = args.at(exec, 1)->toString(exec); - const UString& granularity = args.at(exec, 2)->toString(exec); + Range* range = toRange(args.at(0)); - imp->modify(alter, direction, granularity); + imp->addRange(range); return jsUndefined(); } -JSValuePtr jsDOMSelectionPrototypeFunctionExtend(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMSelection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMSelection::s_info)) return throwError(exec, TypeError); JSDOMSelection* castedThisObj = static_cast<JSDOMSelection*>(asObject(thisValue)); DOMSelection* imp = static_cast<DOMSelection*>(castedThisObj->impl()); - ExceptionCode ec = 0; - Node* node = toNode(args.at(exec, 0)); - int offset = args.at(exec, 1)->toInt32(exec); - imp->extend(node, offset, ec); - setDOMException(exec, ec); - return jsUndefined(); + + JSC::JSValue result = jsString(exec, imp->toString()); + return result; } -JSValuePtr jsDOMSelectionPrototypeFunctionGetRangeAt(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionModify(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMSelection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMSelection::s_info)) return throwError(exec, TypeError); JSDOMSelection* castedThisObj = static_cast<JSDOMSelection*>(asObject(thisValue)); DOMSelection* imp = static_cast<DOMSelection*>(castedThisObj->impl()); - ExceptionCode ec = 0; - int index = args.at(exec, 0)->toInt32(exec); - + const UString& alter = args.at(0).toString(exec); + const UString& direction = args.at(1).toString(exec); + const UString& granularity = args.at(2).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getRangeAt(index, ec))); - setDOMException(exec, ec); - return result; + imp->modify(alter, direction, granularity); + return jsUndefined(); } -JSValuePtr jsDOMSelectionPrototypeFunctionRemoveAllRanges(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionSetBaseAndExtent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMSelection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMSelection::s_info)) return throwError(exec, TypeError); JSDOMSelection* castedThisObj = static_cast<JSDOMSelection*>(asObject(thisValue)); DOMSelection* imp = static_cast<DOMSelection*>(castedThisObj->impl()); + ExceptionCode ec = 0; + Node* baseNode = toNode(args.at(0)); + int baseOffset = args.at(1).toInt32(exec); + Node* extentNode = toNode(args.at(2)); + int extentOffset = args.at(3).toInt32(exec); - imp->removeAllRanges(); + imp->setBaseAndExtent(baseNode, baseOffset, extentNode, extentOffset, ec); + setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsDOMSelectionPrototypeFunctionAddRange(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionSetPosition(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMSelection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMSelection::s_info)) return throwError(exec, TypeError); JSDOMSelection* castedThisObj = static_cast<JSDOMSelection*>(asObject(thisValue)); DOMSelection* imp = static_cast<DOMSelection*>(castedThisObj->impl()); - Range* range = toRange(args.at(exec, 0)); + ExceptionCode ec = 0; + Node* node = toNode(args.at(0)); + int offset = args.at(1).toInt32(exec); - imp->addRange(range); + imp->setPosition(node, offset, ec); + setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsDOMSelectionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionEmpty(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMSelection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMSelection::s_info)) return throwError(exec, TypeError); JSDOMSelection* castedThisObj = static_cast<JSDOMSelection*>(asObject(thisValue)); DOMSelection* imp = static_cast<DOMSelection*>(castedThisObj->impl()); - - JSC::JSValuePtr result = jsString(exec, imp->toString()); - return result; + imp->empty(); + return jsUndefined(); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, DOMSelection* object) +JSC::JSValue toJS(JSC::ExecState* exec, DOMSelection* object) { return getDOMObjectWrapper<JSDOMSelection>(exec, object); } -DOMSelection* toDOMSelection(JSC::JSValuePtr value) +DOMSelection* toDOMSelection(JSC::JSValue value) { - return value->isObject(&JSDOMSelection::s_info) ? static_cast<JSDOMSelection*>(asObject(value))->impl() : 0; + return value.isObject(&JSDOMSelection::s_info) ? static_cast<JSDOMSelection*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMSelection.h b/src/3rdparty/webkit/WebCore/generated/JSDOMSelection.h index cfa166c999..2af8cbd088 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMSelection.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMSelection.h @@ -34,12 +34,12 @@ class JSDOMSelection : public DOMObject { public: JSDOMSelection(PassRefPtr<JSC::Structure>, PassRefPtr<DOMSelection>); virtual ~JSDOMSelection(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -50,16 +50,17 @@ private: RefPtr<DOMSelection> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, DOMSelection*); -DOMSelection* toDOMSelection(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, DOMSelection*); +DOMSelection* toDOMSelection(JSC::JSValue); class JSDOMSelectionPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -68,34 +69,34 @@ public: // Functions -JSC::JSValuePtr jsDOMSelectionPrototypeFunctionCollapse(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMSelectionPrototypeFunctionCollapseToEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMSelectionPrototypeFunctionCollapseToStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMSelectionPrototypeFunctionDeleteFromDocument(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMSelectionPrototypeFunctionContainsNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMSelectionPrototypeFunctionSelectAllChildren(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMSelectionPrototypeFunctionEmpty(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMSelectionPrototypeFunctionSetBaseAndExtent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMSelectionPrototypeFunctionSetPosition(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMSelectionPrototypeFunctionModify(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMSelectionPrototypeFunctionExtend(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMSelectionPrototypeFunctionGetRangeAt(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMSelectionPrototypeFunctionRemoveAllRanges(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMSelectionPrototypeFunctionAddRange(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMSelectionPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionCollapse(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionCollapseToEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionCollapseToStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionDeleteFromDocument(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionContainsNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionSelectAllChildren(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionExtend(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionGetRangeAt(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionRemoveAllRanges(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionAddRange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionModify(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionSetBaseAndExtent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionSetPosition(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionEmpty(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsDOMSelectionAnchorNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMSelectionAnchorOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMSelectionFocusNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMSelectionFocusOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMSelectionBaseNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMSelectionBaseOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMSelectionExtentNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMSelectionExtentOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMSelectionIsCollapsed(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMSelectionType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMSelectionRangeCount(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMSelectionAnchorNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMSelectionAnchorOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMSelectionFocusNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMSelectionFocusOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMSelectionIsCollapsed(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMSelectionRangeCount(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMSelectionBaseNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMSelectionBaseOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMSelectionExtentNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMSelectionExtentOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMSelectionType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMStringList.cpp b/src/3rdparty/webkit/WebCore/generated/JSDOMStringList.cpp index 729cd7db43..9be9b7844e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMStringList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMStringList.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSDOMStringList) +ASSERT_CLASS_FITS_IN_CELL(JSDOMStringList); /* Hash table */ @@ -71,13 +71,13 @@ public: JSDOMStringListConstructor(ExecState* exec) : DOMObject(JSDOMStringListConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSDOMStringListPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSDOMStringListPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -108,9 +108,9 @@ static const HashTable JSDOMStringListPrototypeTable = const ClassInfo JSDOMStringListPrototype::s_info = { "DOMStringListPrototype", 0, &JSDOMStringListPrototypeTable, 0 }; -JSObject* JSDOMStringListPrototype::self(ExecState* exec) +JSObject* JSDOMStringListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSDOMStringList>(exec); + return getDOMPrototype<JSDOMStringList>(exec, globalObject); } bool JSDOMStringListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -129,12 +129,11 @@ JSDOMStringList::JSDOMStringList(PassRefPtr<Structure> structure, PassRefPtr<DOM JSDOMStringList::~JSDOMStringList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSDOMStringList::createPrototype(ExecState* exec) +JSObject* JSDOMStringList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSDOMStringListPrototype(JSDOMStringListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSDOMStringListPrototype(JSDOMStringListPrototype::createStructure(globalObject->objectPrototype())); } bool JSDOMStringList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -157,13 +156,14 @@ bool JSDOMStringList::getOwnPropertySlot(ExecState* exec, unsigned propertyName, return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -JSValuePtr jsDOMStringListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMStringListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMStringList* imp = static_cast<DOMStringList*>(static_cast<JSDOMStringList*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsDOMStringListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMStringListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSDOMStringList*>(asObject(slot.slotBase()))->getConstructor(exec); } @@ -174,39 +174,41 @@ void JSDOMStringList::getPropertyNames(ExecState* exec, PropertyNameArray& prope Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSDOMStringList::getConstructor(ExecState* exec) +JSValue JSDOMStringList::getConstructor(ExecState* exec) { return getDOMConstructor<JSDOMStringListConstructor>(exec); } -JSValuePtr jsDOMStringListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMStringListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMStringList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMStringList::s_info)) return throwError(exec, TypeError); JSDOMStringList* castedThisObj = static_cast<JSDOMStringList*>(asObject(thisValue)); return castedThisObj->item(exec, args); } -JSValuePtr jsDOMStringListPrototypeFunctionContains(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMStringListPrototypeFunctionContains(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDOMStringList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDOMStringList::s_info)) return throwError(exec, TypeError); JSDOMStringList* castedThisObj = static_cast<JSDOMStringList*>(asObject(thisValue)); DOMStringList* imp = static_cast<DOMStringList*>(castedThisObj->impl()); - const UString& str = args.at(exec, 0)->toString(exec); + const UString& str = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->contains(str)); + JSC::JSValue result = jsBoolean(imp->contains(str)); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, DOMStringList* object) +JSC::JSValue toJS(JSC::ExecState* exec, DOMStringList* object) { return getDOMObjectWrapper<JSDOMStringList>(exec, object); } -DOMStringList* toDOMStringList(JSC::JSValuePtr value) +DOMStringList* toDOMStringList(JSC::JSValue value) { - return value->isObject(&JSDOMStringList::s_info) ? static_cast<JSDOMStringList*>(asObject(value))->impl() : 0; + return value.isObject(&JSDOMStringList::s_info) ? static_cast<JSDOMStringList*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMStringList.h b/src/3rdparty/webkit/WebCore/generated/JSDOMStringList.h index a08786b1b1..4d222c8d66 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMStringList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMStringList.h @@ -34,39 +34,40 @@ class JSDOMStringList : public DOMObject { public: JSDOMStringList(PassRefPtr<JSC::Structure>, PassRefPtr<DOMStringList>); virtual ~JSDOMStringList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom functions - JSC::JSValuePtr item(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue item(JSC::ExecState*, const JSC::ArgList&); DOMStringList* impl() const { return m_impl.get(); } private: RefPtr<DOMStringList> m_impl; - JSC::JSValuePtr getByIndex(JSC::ExecState*, unsigned index); + JSC::JSValue getByIndex(JSC::ExecState*, unsigned index); }; -JSC::JSValuePtr toJS(JSC::ExecState*, DOMStringList*); -DOMStringList* toDOMStringList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, DOMStringList*); +DOMStringList* toDOMStringList(JSC::JSValue); class JSDOMStringListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -75,12 +76,12 @@ public: // Functions -JSC::JSValuePtr jsDOMStringListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMStringListPrototypeFunctionContains(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMStringListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMStringListPrototypeFunctionContains(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsDOMStringListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMStringListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMStringListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMStringListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp b/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp index 10b6c3b1a0..bf0809b1d5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp @@ -35,8 +35,8 @@ #include "Database.h" #include "Document.h" #include "Element.h" +#include "Event.h" #include "EventListener.h" -#include "History.h" #include "JSAttr.h" #include "JSBarInfo.h" #include "JSCDATASection.h" @@ -57,6 +57,8 @@ #include "JSCSSVariablesRule.h" #include "JSCanvasRenderingContext2D.h" #include "JSCharacterData.h" +#include "JSClientRect.h" +#include "JSClientRectList.h" #include "JSClipboard.h" #include "JSComment.h" #include "JSConsole.h" @@ -145,9 +147,7 @@ #include "JSHTMLTitleElement.h" #include "JSHTMLUListElement.h" #include "JSHTMLVideoElement.h" -#include "JSHistory.h" #include "JSKeyboardEvent.h" -#include "JSLocation.h" #include "JSMediaError.h" #include "JSMediaList.h" #include "JSMessageEvent.h" @@ -195,9 +195,13 @@ #include "JSWebKitAnimationEvent.h" #include "JSWebKitCSSKeyframeRule.h" #include "JSWebKitCSSKeyframesRule.h" +#include "JSWebKitCSSMatrix.h" #include "JSWebKitCSSTransformValue.h" +#include "JSWebKitPoint.h" #include "JSWebKitTransitionEvent.h" #include "JSWheelEvent.h" +#include "JSWorker.h" +#include "JSXMLHttpRequest.h" #include "JSXMLHttpRequestException.h" #include "JSXMLHttpRequestUpload.h" #include "JSXMLSerializer.h" @@ -205,10 +209,11 @@ #include "JSXPathException.h" #include "JSXPathResult.h" #include "KURL.h" -#include "Location.h" #include "Navigator.h" +#include "RegisteredEventListener.h" #include "Screen.h" #include "Storage.h" +#include "WebKitPoint.h" #include <runtime/Error.h> #include <runtime/JSNumberCell.h> @@ -218,11 +223,11 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSDOMWindow) +ASSERT_CLASS_FITS_IN_CELL(JSDOMWindow); /* Hash table */ -static const HashTableValue JSDOMWindowTableValues[227] = +static const HashTableValue JSDOMWindowTableValues[271] = { { "screen", DontDelete|ReadOnly, (intptr_t)jsDOMWindowScreen, (intptr_t)0 }, { "history", DontDelete|ReadOnly, (intptr_t)jsDOMWindowHistory, (intptr_t)0 }, @@ -235,6 +240,8 @@ static const HashTableValue JSDOMWindowTableValues[227] = { "navigator", DontDelete, (intptr_t)jsDOMWindowNavigator, (intptr_t)setJSDOMWindowNavigator }, { "clientInformation", DontDelete, (intptr_t)jsDOMWindowClientInformation, (intptr_t)setJSDOMWindowClientInformation }, { "location", DontDelete, (intptr_t)jsDOMWindowLocation, (intptr_t)setJSDOMWindowLocation }, + { "event", DontDelete, (intptr_t)jsDOMWindowEvent, (intptr_t)setJSDOMWindowEvent }, + { "crypto", DontDelete|ReadOnly, (intptr_t)jsDOMWindowCrypto, (intptr_t)0 }, { "frameElement", DontDelete|ReadOnly, (intptr_t)jsDOMWindowFrameElement, (intptr_t)0 }, { "offscreenBuffering", DontDelete, (intptr_t)jsDOMWindowOffscreenBuffering, (intptr_t)setJSDOMWindowOffscreenBuffering }, { "outerHeight", DontDelete, (intptr_t)jsDOMWindowOuterHeight, (intptr_t)setJSDOMWindowOuterHeight }, @@ -268,33 +275,66 @@ static const HashTableValue JSDOMWindowTableValues[227] = { "localStorage", DontDelete|ReadOnly, (intptr_t)jsDOMWindowLocalStorage, (intptr_t)0 }, { "console", DontDelete, (intptr_t)jsDOMWindowConsole, (intptr_t)setJSDOMWindowConsole }, { "onabort", DontDelete, (intptr_t)jsDOMWindowOnabort, (intptr_t)setJSDOMWindowOnabort }, + { "onbeforeunload", DontDelete, (intptr_t)jsDOMWindowOnbeforeunload, (intptr_t)setJSDOMWindowOnbeforeunload }, { "onblur", DontDelete, (intptr_t)jsDOMWindowOnblur, (intptr_t)setJSDOMWindowOnblur }, + { "oncanplay", DontDelete, (intptr_t)jsDOMWindowOncanplay, (intptr_t)setJSDOMWindowOncanplay }, + { "oncanplaythrough", DontDelete, (intptr_t)jsDOMWindowOncanplaythrough, (intptr_t)setJSDOMWindowOncanplaythrough }, { "onchange", DontDelete, (intptr_t)jsDOMWindowOnchange, (intptr_t)setJSDOMWindowOnchange }, { "onclick", DontDelete, (intptr_t)jsDOMWindowOnclick, (intptr_t)setJSDOMWindowOnclick }, + { "oncontextmenu", DontDelete, (intptr_t)jsDOMWindowOncontextmenu, (intptr_t)setJSDOMWindowOncontextmenu }, { "ondblclick", DontDelete, (intptr_t)jsDOMWindowOndblclick, (intptr_t)setJSDOMWindowOndblclick }, + { "ondrag", DontDelete, (intptr_t)jsDOMWindowOndrag, (intptr_t)setJSDOMWindowOndrag }, + { "ondragend", DontDelete, (intptr_t)jsDOMWindowOndragend, (intptr_t)setJSDOMWindowOndragend }, + { "ondragenter", DontDelete, (intptr_t)jsDOMWindowOndragenter, (intptr_t)setJSDOMWindowOndragenter }, + { "ondragleave", DontDelete, (intptr_t)jsDOMWindowOndragleave, (intptr_t)setJSDOMWindowOndragleave }, + { "ondragover", DontDelete, (intptr_t)jsDOMWindowOndragover, (intptr_t)setJSDOMWindowOndragover }, + { "ondragstart", DontDelete, (intptr_t)jsDOMWindowOndragstart, (intptr_t)setJSDOMWindowOndragstart }, + { "ondrop", DontDelete, (intptr_t)jsDOMWindowOndrop, (intptr_t)setJSDOMWindowOndrop }, + { "ondurationchange", DontDelete, (intptr_t)jsDOMWindowOndurationchange, (intptr_t)setJSDOMWindowOndurationchange }, + { "onemptied", DontDelete, (intptr_t)jsDOMWindowOnemptied, (intptr_t)setJSDOMWindowOnemptied }, + { "onended", DontDelete, (intptr_t)jsDOMWindowOnended, (intptr_t)setJSDOMWindowOnended }, { "onerror", DontDelete, (intptr_t)jsDOMWindowOnerror, (intptr_t)setJSDOMWindowOnerror }, { "onfocus", DontDelete, (intptr_t)jsDOMWindowOnfocus, (intptr_t)setJSDOMWindowOnfocus }, + { "oninput", DontDelete, (intptr_t)jsDOMWindowOninput, (intptr_t)setJSDOMWindowOninput }, { "onkeydown", DontDelete, (intptr_t)jsDOMWindowOnkeydown, (intptr_t)setJSDOMWindowOnkeydown }, { "onkeypress", DontDelete, (intptr_t)jsDOMWindowOnkeypress, (intptr_t)setJSDOMWindowOnkeypress }, { "onkeyup", DontDelete, (intptr_t)jsDOMWindowOnkeyup, (intptr_t)setJSDOMWindowOnkeyup }, { "onload", DontDelete, (intptr_t)jsDOMWindowOnload, (intptr_t)setJSDOMWindowOnload }, + { "onloadeddata", DontDelete, (intptr_t)jsDOMWindowOnloadeddata, (intptr_t)setJSDOMWindowOnloadeddata }, + { "onloadedmetadata", DontDelete, (intptr_t)jsDOMWindowOnloadedmetadata, (intptr_t)setJSDOMWindowOnloadedmetadata }, + { "onloadstart", DontDelete, (intptr_t)jsDOMWindowOnloadstart, (intptr_t)setJSDOMWindowOnloadstart }, + { "onmessage", DontDelete, (intptr_t)jsDOMWindowOnmessage, (intptr_t)setJSDOMWindowOnmessage }, { "onmousedown", DontDelete, (intptr_t)jsDOMWindowOnmousedown, (intptr_t)setJSDOMWindowOnmousedown }, { "onmousemove", DontDelete, (intptr_t)jsDOMWindowOnmousemove, (intptr_t)setJSDOMWindowOnmousemove }, { "onmouseout", DontDelete, (intptr_t)jsDOMWindowOnmouseout, (intptr_t)setJSDOMWindowOnmouseout }, { "onmouseover", DontDelete, (intptr_t)jsDOMWindowOnmouseover, (intptr_t)setJSDOMWindowOnmouseover }, { "onmouseup", DontDelete, (intptr_t)jsDOMWindowOnmouseup, (intptr_t)setJSDOMWindowOnmouseup }, { "onmousewheel", DontDelete, (intptr_t)jsDOMWindowOnmousewheel, (intptr_t)setJSDOMWindowOnmousewheel }, - { "onreset", DontDelete, (intptr_t)jsDOMWindowOnreset, (intptr_t)setJSDOMWindowOnreset }, + { "onoffline", DontDelete, (intptr_t)jsDOMWindowOnoffline, (intptr_t)setJSDOMWindowOnoffline }, + { "ononline", DontDelete, (intptr_t)jsDOMWindowOnonline, (intptr_t)setJSDOMWindowOnonline }, + { "onpause", DontDelete, (intptr_t)jsDOMWindowOnpause, (intptr_t)setJSDOMWindowOnpause }, + { "onplay", DontDelete, (intptr_t)jsDOMWindowOnplay, (intptr_t)setJSDOMWindowOnplay }, + { "onplaying", DontDelete, (intptr_t)jsDOMWindowOnplaying, (intptr_t)setJSDOMWindowOnplaying }, + { "onprogress", DontDelete, (intptr_t)jsDOMWindowOnprogress, (intptr_t)setJSDOMWindowOnprogress }, + { "onratechange", DontDelete, (intptr_t)jsDOMWindowOnratechange, (intptr_t)setJSDOMWindowOnratechange }, { "onresize", DontDelete, (intptr_t)jsDOMWindowOnresize, (intptr_t)setJSDOMWindowOnresize }, { "onscroll", DontDelete, (intptr_t)jsDOMWindowOnscroll, (intptr_t)setJSDOMWindowOnscroll }, - { "onsearch", DontDelete, (intptr_t)jsDOMWindowOnsearch, (intptr_t)setJSDOMWindowOnsearch }, + { "onseeked", DontDelete, (intptr_t)jsDOMWindowOnseeked, (intptr_t)setJSDOMWindowOnseeked }, + { "onseeking", DontDelete, (intptr_t)jsDOMWindowOnseeking, (intptr_t)setJSDOMWindowOnseeking }, { "onselect", DontDelete, (intptr_t)jsDOMWindowOnselect, (intptr_t)setJSDOMWindowOnselect }, + { "onstalled", DontDelete, (intptr_t)jsDOMWindowOnstalled, (intptr_t)setJSDOMWindowOnstalled }, + { "onstorage", DontDelete, (intptr_t)jsDOMWindowOnstorage, (intptr_t)setJSDOMWindowOnstorage }, { "onsubmit", DontDelete, (intptr_t)jsDOMWindowOnsubmit, (intptr_t)setJSDOMWindowOnsubmit }, + { "onsuspend", DontDelete, (intptr_t)jsDOMWindowOnsuspend, (intptr_t)setJSDOMWindowOnsuspend }, + { "ontimeupdate", DontDelete, (intptr_t)jsDOMWindowOntimeupdate, (intptr_t)setJSDOMWindowOntimeupdate }, { "onunload", DontDelete, (intptr_t)jsDOMWindowOnunload, (intptr_t)setJSDOMWindowOnunload }, - { "onbeforeunload", DontDelete, (intptr_t)jsDOMWindowOnbeforeunload, (intptr_t)setJSDOMWindowOnbeforeunload }, - { "onwebkitanimationstart", DontDelete, (intptr_t)jsDOMWindowOnwebkitanimationstart, (intptr_t)setJSDOMWindowOnwebkitanimationstart }, - { "onwebkitanimationiteration", DontDelete, (intptr_t)jsDOMWindowOnwebkitanimationiteration, (intptr_t)setJSDOMWindowOnwebkitanimationiteration }, + { "onvolumechange", DontDelete, (intptr_t)jsDOMWindowOnvolumechange, (intptr_t)setJSDOMWindowOnvolumechange }, + { "onwaiting", DontDelete, (intptr_t)jsDOMWindowOnwaiting, (intptr_t)setJSDOMWindowOnwaiting }, + { "onreset", DontDelete, (intptr_t)jsDOMWindowOnreset, (intptr_t)setJSDOMWindowOnreset }, + { "onsearch", DontDelete, (intptr_t)jsDOMWindowOnsearch, (intptr_t)setJSDOMWindowOnsearch }, { "onwebkitanimationend", DontDelete, (intptr_t)jsDOMWindowOnwebkitanimationend, (intptr_t)setJSDOMWindowOnwebkitanimationend }, + { "onwebkitanimationiteration", DontDelete, (intptr_t)jsDOMWindowOnwebkitanimationiteration, (intptr_t)setJSDOMWindowOnwebkitanimationiteration }, + { "onwebkitanimationstart", DontDelete, (intptr_t)jsDOMWindowOnwebkitanimationstart, (intptr_t)setJSDOMWindowOnwebkitanimationstart }, { "onwebkittransitionend", DontDelete, (intptr_t)jsDOMWindowOnwebkittransitionend, (intptr_t)setJSDOMWindowOnwebkittransitionend }, { "StyleSheet", DontDelete, (intptr_t)jsDOMWindowStyleSheetConstructor, (intptr_t)setJSDOMWindowStyleSheetConstructor }, { "CSSStyleSheet", DontDelete, (intptr_t)jsDOMWindowCSSStyleSheetConstructor, (intptr_t)setJSDOMWindowCSSStyleSheetConstructor }, @@ -395,6 +435,8 @@ static const HashTableValue JSDOMWindowTableValues[227] = { "HTMLTitleElement", DontDelete, (intptr_t)jsDOMWindowHTMLTitleElementConstructor, (intptr_t)setJSDOMWindowHTMLTitleElementConstructor }, { "HTMLUListElement", DontDelete, (intptr_t)jsDOMWindowHTMLUListElementConstructor, (intptr_t)setJSDOMWindowHTMLUListElementConstructor }, { "HTMLCollection", DontDelete, (intptr_t)jsDOMWindowHTMLCollectionConstructor, (intptr_t)setJSDOMWindowHTMLCollectionConstructor }, + { "Image", DontDelete, (intptr_t)jsDOMWindowImageConstructor, (intptr_t)setJSDOMWindowImageConstructor }, + { "Option", DontDelete, (intptr_t)jsDOMWindowOptionConstructor, (intptr_t)setJSDOMWindowOptionConstructor }, { "CanvasRenderingContext2D", DontDelete, (intptr_t)jsDOMWindowCanvasRenderingContext2DConstructor, (intptr_t)setJSDOMWindowCanvasRenderingContext2DConstructor }, { "TextMetrics", DontDelete, (intptr_t)jsDOMWindowTextMetricsConstructor, (intptr_t)setJSDOMWindowTextMetricsConstructor }, { "Event", DontDelete, (intptr_t)jsDOMWindowEventConstructor, (intptr_t)setJSDOMWindowEventConstructor }, @@ -412,6 +454,8 @@ static const HashTableValue JSDOMWindowTableValues[227] = { "EventException", DontDelete, (intptr_t)jsDOMWindowEventExceptionConstructor, (intptr_t)setJSDOMWindowEventExceptionConstructor }, { "WebKitCSSKeyframeRule", DontDelete, (intptr_t)jsDOMWindowWebKitCSSKeyframeRuleConstructor, (intptr_t)setJSDOMWindowWebKitCSSKeyframeRuleConstructor }, { "WebKitCSSKeyframesRule", DontDelete, (intptr_t)jsDOMWindowWebKitCSSKeyframesRuleConstructor, (intptr_t)setJSDOMWindowWebKitCSSKeyframesRuleConstructor }, + { "WebKitCSSMatrix", DontDelete, (intptr_t)jsDOMWindowWebKitCSSMatrixConstructor, (intptr_t)setJSDOMWindowWebKitCSSMatrixConstructor }, + { "WebKitPoint", DontDelete, (intptr_t)jsDOMWindowWebKitPointConstructor, (intptr_t)setJSDOMWindowWebKitPointConstructor }, { "Clipboard", DontDelete, (intptr_t)jsDOMWindowClipboardConstructor, (intptr_t)setJSDOMWindowClipboardConstructor }, { "File", DontDelete, (intptr_t)jsDOMWindowFileConstructor, (intptr_t)setJSDOMWindowFileConstructor }, { "FileList", DontDelete, (intptr_t)jsDOMWindowFileListConstructor, (intptr_t)setJSDOMWindowFileListConstructor }, @@ -421,15 +465,22 @@ static const HashTableValue JSDOMWindowTableValues[227] = { "XMLDocument", DontDelete, (intptr_t)jsDOMWindowXMLDocumentConstructor, (intptr_t)setJSDOMWindowXMLDocumentConstructor }, { "DOMParser", DontDelete, (intptr_t)jsDOMWindowDOMParserConstructor, (intptr_t)setJSDOMWindowDOMParserConstructor }, { "XMLSerializer", DontDelete, (intptr_t)jsDOMWindowXMLSerializerConstructor, (intptr_t)setJSDOMWindowXMLSerializerConstructor }, + { "XMLHttpRequest", DontDelete, (intptr_t)jsDOMWindowXMLHttpRequestConstructor, (intptr_t)setJSDOMWindowXMLHttpRequestConstructor }, { "XMLHttpRequestUpload", DontDelete, (intptr_t)jsDOMWindowXMLHttpRequestUploadConstructor, (intptr_t)setJSDOMWindowXMLHttpRequestUploadConstructor }, { "XMLHttpRequestException", DontDelete, (intptr_t)jsDOMWindowXMLHttpRequestExceptionConstructor, (intptr_t)setJSDOMWindowXMLHttpRequestExceptionConstructor }, + { "Worker", DontDelete, (intptr_t)jsDOMWindowWorkerConstructor, (intptr_t)setJSDOMWindowWorkerConstructor }, { "Plugin", DontDelete, (intptr_t)jsDOMWindowPluginConstructor, (intptr_t)setJSDOMWindowPluginConstructor }, { "PluginArray", DontDelete, (intptr_t)jsDOMWindowPluginArrayConstructor, (intptr_t)setJSDOMWindowPluginArrayConstructor }, { "MimeType", DontDelete, (intptr_t)jsDOMWindowMimeTypeConstructor, (intptr_t)setJSDOMWindowMimeTypeConstructor }, { "MimeTypeArray", DontDelete, (intptr_t)jsDOMWindowMimeTypeArrayConstructor, (intptr_t)setJSDOMWindowMimeTypeArrayConstructor }, + { "ClientRect", DontDelete, (intptr_t)jsDOMWindowClientRectConstructor, (intptr_t)setJSDOMWindowClientRectConstructor }, + { "ClientRectList", DontDelete, (intptr_t)jsDOMWindowClientRectListConstructor, (intptr_t)setJSDOMWindowClientRectListConstructor }, { "Storage", DontDelete, (intptr_t)jsDOMWindowStorageConstructor, (intptr_t)setJSDOMWindowStorageConstructor }, { "StorageEvent", DontDelete, (intptr_t)jsDOMWindowStorageEventConstructor, (intptr_t)setJSDOMWindowStorageEventConstructor }, #if ENABLE(VIDEO) + { "Audio", DontDelete, (intptr_t)jsDOMWindowAudioConstructor, (intptr_t)setJSDOMWindowAudioConstructor }, +#endif +#if ENABLE(VIDEO) { "HTMLAudioElement", DontDelete, (intptr_t)jsDOMWindowHTMLAudioElementConstructor, (intptr_t)setJSDOMWindowHTMLAudioElementConstructor }, #endif #if ENABLE(VIDEO) @@ -465,12 +516,12 @@ static const HashTable JSDOMWindowTable = #if ENABLE(PERFECT_HASH_SIZE) { 32767, JSDOMWindowTableValues, 0 }; #else - { 553, 511, JSDOMWindowTableValues, 0 }; + { 1062, 1023, JSDOMWindowTableValues, 0 }; #endif /* Hash table for prototype */ -static const HashTableValue JSDOMWindowPrototypeTableValues[30] = +static const HashTableValue JSDOMWindowPrototypeTableValues[37] = { { "getSelection", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionGetSelection, (intptr_t)0 }, { "focus", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionFocus, (intptr_t)0 }, @@ -478,6 +529,8 @@ static const HashTableValue JSDOMWindowPrototypeTableValues[30] = { "close", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionClose, (intptr_t)0 }, { "print", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionPrint, (intptr_t)0 }, { "stop", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionStop, (intptr_t)0 }, + { "open", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionOpen, (intptr_t)3 }, + { "showModalDialog", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionShowModalDialog, (intptr_t)3 }, { "alert", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionAlert, (intptr_t)1 }, { "confirm", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionConfirm, (intptr_t)1 }, { "prompt", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionPrompt, (intptr_t)2 }, @@ -491,6 +544,8 @@ static const HashTableValue JSDOMWindowPrototypeTableValues[30] = { "resizeTo", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionResizeTo, (intptr_t)2 }, { "getComputedStyle", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionGetComputedStyle, (intptr_t)2 }, { "getMatchedCSSRules", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionGetMatchedCSSRules, (intptr_t)3 }, + { "webkitConvertPointFromPageToNode", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionWebkitConvertPointFromPageToNode, (intptr_t)2 }, + { "webkitConvertPointFromNodeToPage", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionWebkitConvertPointFromNodeToPage, (intptr_t)2 }, { "openDatabase", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionOpenDatabase, (intptr_t)4 }, { "postMessage", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionPostMessage, (intptr_t)3 }, { "setTimeout", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionSetTimeout, (intptr_t)2 }, @@ -501,14 +556,17 @@ static const HashTableValue JSDOMWindowPrototypeTableValues[30] = { "btoa", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionBtoa, (intptr_t)1 }, { "addEventListener", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionAddEventListener, (intptr_t)3 }, { "removeEventListener", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionRemoveEventListener, (intptr_t)3 }, + { "dispatchEvent", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionDispatchEvent, (intptr_t)1 }, + { "captureEvents", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionCaptureEvents, (intptr_t)0 }, + { "releaseEvents", DontDelete|Function, (intptr_t)jsDOMWindowPrototypeFunctionReleaseEvents, (intptr_t)0 }, { 0, 0, 0, 0 } }; static const HashTable JSDOMWindowPrototypeTable = #if ENABLE(PERFECT_HASH_SIZE) - { 511, JSDOMWindowPrototypeTableValues, 0 }; + { 1023, JSDOMWindowPrototypeTableValues, 0 }; #else - { 69, 63, JSDOMWindowPrototypeTableValues, 0 }; + { 134, 127, JSDOMWindowPrototypeTableValues, 0 }; #endif const ClassInfo JSDOMWindowPrototype::s_info = { "DOMWindowPrototype", 0, &JSDOMWindowPrototypeTable, 0 }; @@ -530,6 +588,11 @@ JSDOMWindow::JSDOMWindow(PassRefPtr<Structure> structure, PassRefPtr<DOMWindow> { } +JSDOMWindow::~JSDOMWindow() +{ + invalidateEventListeners(impl()->eventListeners()); +} + bool JSDOMWindow::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { if (customGetOwnPropertySlot(exec, propertyName, slot)) @@ -537,91 +600,112 @@ bool JSDOMWindow::getOwnPropertySlot(ExecState* exec, const Identifier& property return getStaticValueSlot<JSDOMWindow, Base>(exec, &JSDOMWindowTable, this, propertyName, slot); } -JSValuePtr jsDOMWindowScreen(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowScreen(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->screen())); } -JSValuePtr jsDOMWindowHistory(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHistory(ExecState* exec, const Identifier&, const PropertySlot& slot) { - DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->history())); + return static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->history(exec); } -JSValuePtr jsDOMWindowLocationbar(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowLocationbar(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->locationbar())); } -JSValuePtr jsDOMWindowMenubar(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowMenubar(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->menubar())); } -JSValuePtr jsDOMWindowPersonalbar(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowPersonalbar(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->personalbar())); } -JSValuePtr jsDOMWindowScrollbars(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowScrollbars(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->scrollbars())); } -JSValuePtr jsDOMWindowStatusbar(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowStatusbar(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->statusbar())); } -JSValuePtr jsDOMWindowToolbar(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowToolbar(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->toolbar())); } -JSValuePtr jsDOMWindowNavigator(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowNavigator(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->navigator())); } -JSValuePtr jsDOMWindowClientInformation(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowClientInformation(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->clientInformation())); } -JSValuePtr jsDOMWindowLocation(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowLocation(ExecState* exec, const Identifier&, const PropertySlot& slot) { - DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->location())); + return static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->location(exec); +} + +JSValue jsDOMWindowEvent(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + return static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->event(exec); } -JSValuePtr jsDOMWindowFrameElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCrypto(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + return static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->crypto(exec); +} + +JSValue jsDOMWindowFrameElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); @@ -629,2163 +713,3267 @@ JSValuePtr jsDOMWindowFrameElement(ExecState* exec, const Identifier&, const Pro return checkNodeSecurity(exec, imp->frameElement()) ? toJS(exec, WTF::getPtr(imp->frameElement())) : jsUndefined(); } -JSValuePtr jsDOMWindowOffscreenBuffering(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOffscreenBuffering(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->offscreenBuffering()); } -JSValuePtr jsDOMWindowOuterHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOuterHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->outerHeight()); } -JSValuePtr jsDOMWindowOuterWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOuterWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->outerWidth()); } -JSValuePtr jsDOMWindowInnerHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowInnerHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->innerHeight()); } -JSValuePtr jsDOMWindowInnerWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowInnerWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->innerWidth()); } -JSValuePtr jsDOMWindowScreenX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowScreenX(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->screenX()); } -JSValuePtr jsDOMWindowScreenY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowScreenY(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->screenY()); } -JSValuePtr jsDOMWindowScreenLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowScreenLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->screenLeft()); } -JSValuePtr jsDOMWindowScreenTop(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowScreenTop(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->screenTop()); } -JSValuePtr jsDOMWindowScrollX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowScrollX(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->scrollX()); } -JSValuePtr jsDOMWindowScrollY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowScrollY(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->scrollY()); } -JSValuePtr jsDOMWindowPageXOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowPageXOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->pageXOffset()); } -JSValuePtr jsDOMWindowPageYOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowPageYOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->pageYOffset()); } -JSValuePtr jsDOMWindowClosed(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowClosed(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->closed()); } -JSValuePtr jsDOMWindowLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsDOMWindowName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowName(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsDOMWindowStatus(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowStatus(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->status()); } -JSValuePtr jsDOMWindowDefaultStatus(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowDefaultStatus(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->defaultStatus()); } -JSValuePtr jsDOMWindowDefaultstatus(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowDefaultstatus(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->defaultstatus()); } -JSValuePtr jsDOMWindowSelf(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowSelf(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->self())); } -JSValuePtr jsDOMWindowWindow(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowWindow(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->window())); } -JSValuePtr jsDOMWindowFrames(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowFrames(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->frames())); } -JSValuePtr jsDOMWindowOpener(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOpener(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->opener())); } -JSValuePtr jsDOMWindowParent(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowParent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->parent())); } -JSValuePtr jsDOMWindowTop(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowTop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->top())); } -JSValuePtr jsDOMWindowDocument(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowDocument(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->document())); } -JSValuePtr jsDOMWindowDevicePixelRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowDevicePixelRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->devicePixelRatio()); } -JSValuePtr jsDOMWindowApplicationCache(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowApplicationCache(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->applicationCache())); } -JSValuePtr jsDOMWindowSessionStorage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowSessionStorage(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->sessionStorage())); } -JSValuePtr jsDOMWindowLocalStorage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowLocalStorage(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->localStorage())); } -JSValuePtr jsDOMWindowConsole(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowConsole(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->console())); } -JSValuePtr jsDOMWindowOnabort(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnabort(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onabort()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnbeforeunload(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onbeforeunload()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnblur(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onblur()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOncanplay(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->oncanplay()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOncanplaythrough(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->oncanplaythrough()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnchange(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onchange()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnclick(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onclick()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOncontextmenu(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->oncontextmenu()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOndblclick(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondblclick()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOndrag(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondrag()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOndragend(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondragend()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOndragenter(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondragenter()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOndragleave(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondragleave()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOndragover(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondragover()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOndragstart(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondragstart()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOndrop(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondrop()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOndurationchange(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondurationchange()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnemptied(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onemptied()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnended(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onended()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onerror()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnfocus(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onfocus()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOninput(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->oninput()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnkeydown(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onkeydown()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnkeypress(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onkeypress()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnkeyup(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onkeyup()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnload(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onload()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnloadeddata(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onloadeddata()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnloadedmetadata(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onloadedmetadata()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnloadstart(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onloadstart()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnmessage(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onmessage()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnmousedown(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onmousedown()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnmousemove(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onmousemove()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnmouseout(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onmouseout()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsDOMWindowOnmouseover(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onabort())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onmouseover()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnblur(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnmouseup(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onblur())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onmouseup()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnchange(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnmousewheel(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onchange())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onmousewheel()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnclick(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnoffline(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onclick())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onoffline()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOndblclick(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnonline(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondblclick())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->ononline()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnpause(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onerror())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onpause()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnfocus(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnplay(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onfocus())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onplay()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnkeydown(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnplaying(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onkeydown())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onplaying()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnkeypress(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnprogress(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onkeypress())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onprogress()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnkeyup(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnratechange(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onkeyup())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onratechange()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnload(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnresize(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onload())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onresize()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnmousedown(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnscroll(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmousedown())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onscroll()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnmousemove(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnseeked(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmousemove())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onseeked()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnmouseout(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnseeking(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmouseout())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onseeking()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnmouseover(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnselect(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmouseover())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onselect()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnmouseup(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnstalled(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmouseup())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onstalled()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnmousewheel(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnstorage(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmousewheel())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onstorage()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnreset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnsubmit(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onreset())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onsubmit()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnresize(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnsuspend(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onresize())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onsuspend()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnscroll(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOntimeupdate(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onscroll())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->ontimeupdate()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnsearch(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnunload(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onsearch())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onunload()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnselect(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnvolumechange(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onselect())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onvolumechange()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnsubmit(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnwaiting(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onsubmit())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onwaiting()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnunload(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnreset(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onunload())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onreset()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnbeforeunload(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnsearch(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onbeforeunload())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onsearch()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnwebkitanimationstart(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnwebkitanimationend(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onwebkitanimationstart())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onwebkitanimationend()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnwebkitanimationiteration(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnwebkitanimationiteration(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onwebkitanimationiteration())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onwebkitanimationiteration()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnwebkitanimationend(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnwebkitanimationstart(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onwebkitanimationend())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onwebkitanimationstart()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowOnwebkittransitionend(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOnwebkittransitionend(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onwebkittransitionend())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onwebkittransitionend()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsDOMWindowStyleSheetConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowStyleSheetConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSStyleSheet::getConstructor(exec); } -JSValuePtr jsDOMWindowCSSStyleSheetConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCSSStyleSheetConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCSSStyleSheet::getConstructor(exec); } -JSValuePtr jsDOMWindowCSSValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCSSValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCSSValue::getConstructor(exec); } -JSValuePtr jsDOMWindowCSSPrimitiveValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCSSPrimitiveValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCSSPrimitiveValue::getConstructor(exec); } -JSValuePtr jsDOMWindowCSSValueListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCSSValueListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCSSValueList::getConstructor(exec); } -JSValuePtr jsDOMWindowWebKitCSSTransformValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowWebKitCSSTransformValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSWebKitCSSTransformValue::getConstructor(exec); } -JSValuePtr jsDOMWindowCSSRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCSSRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCSSRule::getConstructor(exec); } -JSValuePtr jsDOMWindowCSSCharsetRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCSSCharsetRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCSSCharsetRule::getConstructor(exec); } -JSValuePtr jsDOMWindowCSSFontFaceRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCSSFontFaceRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCSSFontFaceRule::getConstructor(exec); } -JSValuePtr jsDOMWindowCSSImportRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCSSImportRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCSSImportRule::getConstructor(exec); } -JSValuePtr jsDOMWindowCSSMediaRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCSSMediaRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCSSMediaRule::getConstructor(exec); } -JSValuePtr jsDOMWindowCSSPageRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCSSPageRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCSSPageRule::getConstructor(exec); } -JSValuePtr jsDOMWindowCSSStyleRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCSSStyleRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCSSStyleRule::getConstructor(exec); } -JSValuePtr jsDOMWindowCSSVariablesRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCSSVariablesRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCSSVariablesRule::getConstructor(exec); } -JSValuePtr jsDOMWindowCSSVariablesDeclarationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCSSVariablesDeclarationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCSSVariablesDeclaration::getConstructor(exec); } -JSValuePtr jsDOMWindowCSSStyleDeclarationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCSSStyleDeclarationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCSSStyleDeclaration::getConstructor(exec); } -JSValuePtr jsDOMWindowMediaListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowMediaListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSMediaList::getConstructor(exec); } -JSValuePtr jsDOMWindowCounterConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCounterConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCounter::getConstructor(exec); } -JSValuePtr jsDOMWindowCSSRuleListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCSSRuleListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCSSRuleList::getConstructor(exec); } -JSValuePtr jsDOMWindowRectConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowRectConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSRect::getConstructor(exec); } -JSValuePtr jsDOMWindowStyleSheetListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowStyleSheetListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSStyleSheetList::getConstructor(exec); } -JSValuePtr jsDOMWindowDOMExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowDOMExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSDOMCoreException::getConstructor(exec); } -JSValuePtr jsDOMWindowDOMStringListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowDOMStringListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSDOMStringList::getConstructor(exec); } -JSValuePtr jsDOMWindowDOMImplementationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowDOMImplementationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSDOMImplementation::getConstructor(exec); } -JSValuePtr jsDOMWindowDocumentFragmentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowDocumentFragmentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSDocumentFragment::getConstructor(exec); } -JSValuePtr jsDOMWindowDocumentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowDocumentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSDocument::getConstructor(exec); } -JSValuePtr jsDOMWindowNodeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowNodeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSNode::getConstructor(exec); } -JSValuePtr jsDOMWindowNodeListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowNodeListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSNodeList::getConstructor(exec); } -JSValuePtr jsDOMWindowNamedNodeMapConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowNamedNodeMapConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSNamedNodeMap::getConstructor(exec); } -JSValuePtr jsDOMWindowCharacterDataConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCharacterDataConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCharacterData::getConstructor(exec); } -JSValuePtr jsDOMWindowAttrConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowAttrConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSAttr::getConstructor(exec); } -JSValuePtr jsDOMWindowElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSElement::getConstructor(exec); } -JSValuePtr jsDOMWindowTextConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowTextConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSText::getConstructor(exec); } -JSValuePtr jsDOMWindowCommentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCommentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSComment::getConstructor(exec); } -JSValuePtr jsDOMWindowCDATASectionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowCDATASectionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCDATASection::getConstructor(exec); } -JSValuePtr jsDOMWindowDocumentTypeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowDocumentTypeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSDocumentType::getConstructor(exec); } -JSValuePtr jsDOMWindowNotationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowNotationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSNotation::getConstructor(exec); } -JSValuePtr jsDOMWindowEntityConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowEntityConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSEntity::getConstructor(exec); } -JSValuePtr jsDOMWindowEntityReferenceConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowEntityReferenceConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSEntityReference::getConstructor(exec); } -JSValuePtr jsDOMWindowProcessingInstructionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowProcessingInstructionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSProcessingInstruction::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLDocumentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLDocumentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLDocument::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLAnchorElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLAnchorElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLAnchorElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLAppletElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLAppletElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLAppletElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLAreaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLAreaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLAreaElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLBRElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLBRElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLBRElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLBaseElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLBaseElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLBaseElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLBaseFontElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLBaseFontElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLBaseFontElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLBlockquoteElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLBlockquoteElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLBlockquoteElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLBodyElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLBodyElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLBodyElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLButtonElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLButtonElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLButtonElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLCanvasElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLCanvasElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLCanvasElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLDListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLDListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLDListElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLDirectoryElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLDirectoryElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLDirectoryElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLDivElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLDivElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLDivElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLEmbedElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLEmbedElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLEmbedElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLFieldSetElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLFieldSetElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLFieldSetElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLFontElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLFontElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLFontElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLFormElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLFormElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLFormElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLFrameElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLFrameElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLFrameElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLFrameSetElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLFrameSetElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLFrameSetElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLHRElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLHRElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLHRElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLHeadElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLHeadElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLHeadElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLHeadingElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLHeadingElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLHeadingElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLHtmlElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLHtmlElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLHtmlElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLIFrameElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLIFrameElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLIFrameElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLImageElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLImageElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLImageElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLInputElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLInputElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLInputElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLIsIndexElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLIsIndexElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLIsIndexElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLLIElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLLIElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLLIElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLLabelElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLLabelElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLLabelElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLLegendElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLLegendElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLLegendElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLLinkElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLLinkElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLLinkElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLMapElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLMapElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLMapElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLMarqueeElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLMarqueeElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLMarqueeElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLMenuElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLMenuElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLMenuElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLMetaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLMetaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLMetaElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLModElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLModElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLModElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLOListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLOListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLOListElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLObjectElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLObjectElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLObjectElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLOptGroupElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLOptGroupElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLOptGroupElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLOptionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLOptionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLOptionElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLParagraphElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLParagraphElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLParagraphElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLParamElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLParamElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLParamElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLPreElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLPreElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLPreElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLQuoteElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLQuoteElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLQuoteElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLScriptElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLScriptElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLScriptElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLSelectElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLSelectElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLSelectElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLStyleElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLStyleElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLStyleElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLTableCaptionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLTableCaptionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLTableCaptionElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLTableCellElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLTableCellElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLTableCellElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLTableColElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLTableColElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLTableColElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLTableElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLTableElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLTableElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLTableRowElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLTableRowElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLTableRowElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLTableSectionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLTableSectionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLTableSectionElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLTextAreaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLTextAreaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLTextAreaElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLTitleElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLTitleElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLTitleElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLUListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLUListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLUListElement::getConstructor(exec); } -JSValuePtr jsDOMWindowHTMLCollectionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLCollectionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLCollection::getConstructor(exec); } -JSValuePtr jsDOMWindowCanvasRenderingContext2DConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowImageConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + return static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->image(exec); +} + +JSValue jsDOMWindowOptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + return static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->option(exec); +} + +JSValue jsDOMWindowCanvasRenderingContext2DConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSCanvasRenderingContext2D::getConstructor(exec); } -JSValuePtr jsDOMWindowTextMetricsConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowTextMetricsConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSTextMetrics::getConstructor(exec); } -JSValuePtr jsDOMWindowEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSEvent::getConstructor(exec); } -JSValuePtr jsDOMWindowKeyboardEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowKeyboardEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSKeyboardEvent::getConstructor(exec); } -JSValuePtr jsDOMWindowMouseEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowMouseEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSMouseEvent::getConstructor(exec); } -JSValuePtr jsDOMWindowMutationEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowMutationEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSMutationEvent::getConstructor(exec); } -JSValuePtr jsDOMWindowOverflowEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowOverflowEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSOverflowEvent::getConstructor(exec); } -JSValuePtr jsDOMWindowProgressEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowProgressEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSProgressEvent::getConstructor(exec); } -JSValuePtr jsDOMWindowTextEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowTextEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSTextEvent::getConstructor(exec); } -JSValuePtr jsDOMWindowUIEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowUIEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSUIEvent::getConstructor(exec); } -JSValuePtr jsDOMWindowWebKitAnimationEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowWebKitAnimationEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSWebKitAnimationEvent::getConstructor(exec); } -JSValuePtr jsDOMWindowWebKitTransitionEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowWebKitTransitionEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSWebKitTransitionEvent::getConstructor(exec); } -JSValuePtr jsDOMWindowWheelEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowWheelEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSWheelEvent::getConstructor(exec); } -JSValuePtr jsDOMWindowMessageEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowMessageEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSMessageEvent::getConstructor(exec); } -JSValuePtr jsDOMWindowEventExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowEventExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSEventException::getConstructor(exec); } -JSValuePtr jsDOMWindowWebKitCSSKeyframeRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowWebKitCSSKeyframeRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSWebKitCSSKeyframeRule::getConstructor(exec); } -JSValuePtr jsDOMWindowWebKitCSSKeyframesRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowWebKitCSSKeyframesRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSWebKitCSSKeyframesRule::getConstructor(exec); } -JSValuePtr jsDOMWindowClipboardConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowWebKitCSSMatrixConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + return static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->webKitCSSMatrix(exec); +} + +JSValue jsDOMWindowWebKitPointConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + return static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->webKitPoint(exec); +} + +JSValue jsDOMWindowClipboardConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSClipboard::getConstructor(exec); } -JSValuePtr jsDOMWindowFileConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowFileConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSFile::getConstructor(exec); } -JSValuePtr jsDOMWindowFileListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowFileListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSFileList::getConstructor(exec); } -JSValuePtr jsDOMWindowNodeFilterConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowNodeFilterConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSNodeFilter::getConstructor(exec); } -JSValuePtr jsDOMWindowRangeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowRangeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSRange::getConstructor(exec); } -JSValuePtr jsDOMWindowRangeExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowRangeExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSRangeException::getConstructor(exec); } -JSValuePtr jsDOMWindowXMLDocumentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowXMLDocumentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSDocument::getConstructor(exec); } -JSValuePtr jsDOMWindowDOMParserConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowDOMParserConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSDOMParser::getConstructor(exec); } -JSValuePtr jsDOMWindowXMLSerializerConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowXMLSerializerConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSXMLSerializer::getConstructor(exec); } -JSValuePtr jsDOMWindowXMLHttpRequestUploadConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowXMLHttpRequestConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + return static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->xmlHttpRequest(exec); +} + +JSValue jsDOMWindowXMLHttpRequestUploadConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(slot); return JSXMLHttpRequestUpload::getConstructor(exec); } -JSValuePtr jsDOMWindowXMLHttpRequestExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowXMLHttpRequestExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSXMLHttpRequestException::getConstructor(exec); } -JSValuePtr jsDOMWindowPluginConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowWorkerConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + return static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->worker(exec); +} + +JSValue jsDOMWindowPluginConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSPlugin::getConstructor(exec); } -JSValuePtr jsDOMWindowPluginArrayConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowPluginArrayConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSPluginArray::getConstructor(exec); } -JSValuePtr jsDOMWindowMimeTypeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowMimeTypeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSMimeType::getConstructor(exec); } -JSValuePtr jsDOMWindowMimeTypeArrayConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowMimeTypeArrayConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSMimeTypeArray::getConstructor(exec); } -JSValuePtr jsDOMWindowStorageConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowClientRectConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(slot); + return JSClientRect::getConstructor(exec); +} + +JSValue jsDOMWindowClientRectListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(slot); + return JSClientRectList::getConstructor(exec); +} + +JSValue jsDOMWindowStorageConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSStorage::getConstructor(exec); } -JSValuePtr jsDOMWindowStorageEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowStorageEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSStorageEvent::getConstructor(exec); } #if ENABLE(VIDEO) -JSValuePtr jsDOMWindowHTMLAudioElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowAudioConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + return static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->audio(exec); +} +#endif + +#if ENABLE(VIDEO) +JSValue jsDOMWindowHTMLAudioElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLAudioElement::getConstructor(exec); } #endif #if ENABLE(VIDEO) -JSValuePtr jsDOMWindowHTMLMediaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLMediaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLMediaElement::getConstructor(exec); } #endif #if ENABLE(VIDEO) -JSValuePtr jsDOMWindowHTMLVideoElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowHTMLVideoElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSHTMLVideoElement::getConstructor(exec); } #endif #if ENABLE(VIDEO) -JSValuePtr jsDOMWindowMediaErrorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowMediaErrorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSMediaError::getConstructor(exec); } #endif -JSValuePtr jsDOMWindowXPathEvaluatorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowXPathEvaluatorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSXPathEvaluator::getConstructor(exec); } -JSValuePtr jsDOMWindowXPathResultConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowXPathResultConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSXPathResult::getConstructor(exec); } -JSValuePtr jsDOMWindowXPathExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowXPathExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSXPathException::getConstructor(exec); } -JSValuePtr jsDOMWindowSVGAngleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowSVGAngleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSSVGAngle::getConstructor(exec); } -JSValuePtr jsDOMWindowSVGColorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowSVGColorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSSVGColor::getConstructor(exec); } -JSValuePtr jsDOMWindowSVGExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowSVGExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSSVGException::getConstructor(exec); } -JSValuePtr jsDOMWindowSVGGradientElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowSVGGradientElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSSVGGradientElement::getConstructor(exec); } -JSValuePtr jsDOMWindowSVGLengthConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowSVGLengthConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSSVGLength::getConstructor(exec); } -JSValuePtr jsDOMWindowSVGMarkerElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowSVGMarkerElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSSVGMarkerElement::getConstructor(exec); } -JSValuePtr jsDOMWindowSVGPaintConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowSVGPaintConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSSVGPaint::getConstructor(exec); } -JSValuePtr jsDOMWindowSVGPathSegConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowSVGPathSegConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSSVGPathSeg::getConstructor(exec); } -JSValuePtr jsDOMWindowSVGPreserveAspectRatioConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowSVGPreserveAspectRatioConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSSVGPreserveAspectRatio::getConstructor(exec); } -JSValuePtr jsDOMWindowSVGRenderingIntentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowSVGRenderingIntentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSSVGRenderingIntent::getConstructor(exec); } -JSValuePtr jsDOMWindowSVGTextContentElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowSVGTextContentElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSSVGTextContentElement::getConstructor(exec); } -JSValuePtr jsDOMWindowSVGTextPathElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowSVGTextPathElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSSVGTextPathElement::getConstructor(exec); } -JSValuePtr jsDOMWindowSVGTransformConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowSVGTransformConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSSVGTransform::getConstructor(exec); } -JSValuePtr jsDOMWindowSVGUnitTypesConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDOMWindowSVGUnitTypesConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { if (!static_cast<JSDOMWindow*>(asObject(slot.slotBase()))->allowsAccessFrom(exec)) return jsUndefined(); + UNUSED_PARAM(slot); return JSSVGUnitTypes::getConstructor(exec); } -void JSDOMWindow::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSDOMWindow::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { if (customPut(exec, propertyName, value, slot)) return; lookupPut<JSDOMWindow, Base>(exec, propertyName, value, &JSDOMWindowTable, this, slot); } -void setJSDOMWindowLocationbar(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowLocationbar(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "locationbar"), value); } -void setJSDOMWindowMenubar(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowMenubar(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "menubar"), value); } -void setJSDOMWindowPersonalbar(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowPersonalbar(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "personalbar"), value); } -void setJSDOMWindowScrollbars(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowScrollbars(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "scrollbars"), value); } -void setJSDOMWindowStatusbar(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowStatusbar(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "statusbar"), value); } -void setJSDOMWindowToolbar(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowToolbar(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "toolbar"), value); } -void setJSDOMWindowNavigator(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowNavigator(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "navigator"), value); } -void setJSDOMWindowClientInformation(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowClientInformation(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "clientInformation"), value); } -void setJSDOMWindowLocation(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowLocation(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSDOMWindow*>(thisObject)->setLocation(exec, value); } -void setJSDOMWindowOffscreenBuffering(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowEvent(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + // Shadowing a built-in object + static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "event"), value); +} + +void setJSDOMWindowOffscreenBuffering(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "offscreenBuffering"), value); } -void setJSDOMWindowOuterHeight(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOuterHeight(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "outerHeight"), value); } -void setJSDOMWindowOuterWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOuterWidth(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "outerWidth"), value); } -void setJSDOMWindowInnerHeight(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowInnerHeight(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "innerHeight"), value); } -void setJSDOMWindowInnerWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowInnerWidth(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "innerWidth"), value); } -void setJSDOMWindowScreenX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowScreenX(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "screenX"), value); } -void setJSDOMWindowScreenY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowScreenY(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "screenY"), value); } -void setJSDOMWindowScreenLeft(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowScreenLeft(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "screenLeft"), value); } -void setJSDOMWindowScreenTop(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowScreenTop(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "screenTop"), value); } -void setJSDOMWindowScrollX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowScrollX(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "scrollX"), value); } -void setJSDOMWindowScrollY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowScrollY(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "scrollY"), value); } -void setJSDOMWindowLength(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowLength(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "length"), value); } -void setJSDOMWindowName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowName(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); - imp->setName(value->toString(exec)); + imp->setName(value.toString(exec)); } -void setJSDOMWindowStatus(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowStatus(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); - imp->setStatus(value->toString(exec)); + imp->setStatus(value.toString(exec)); } -void setJSDOMWindowDefaultStatus(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowDefaultStatus(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); - imp->setDefaultStatus(value->toString(exec)); + imp->setDefaultStatus(value.toString(exec)); } -void setJSDOMWindowDefaultstatus(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowDefaultstatus(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); - imp->setDefaultstatus(value->toString(exec)); + imp->setDefaultstatus(value.toString(exec)); } -void setJSDOMWindowSelf(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowSelf(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "self"), value); } -void setJSDOMWindowFrames(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowFrames(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "frames"), value); } -void setJSDOMWindowOpener(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOpener(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "opener"), value); } -void setJSDOMWindowParent(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowParent(ExecState* exec, JSObject* thisObject, JSValue value) { + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "parent"), value); } -void setJSDOMWindowTop(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowTop(ExecState* exec, JSObject* thisObject, JSValue value) { + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "top"), value); } -void setJSDOMWindowDevicePixelRatio(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowDevicePixelRatio(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "devicePixelRatio"), value); } -void setJSDOMWindowConsole(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowConsole(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + // Shadowing a built-in object static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "console"), value); } -void setJSDOMWindowOnabort(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnabort(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnabort(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnabort(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnblur(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnbeforeunload(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnblur(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnbeforeunload(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnchange(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnblur(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnchange(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnblur(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnclick(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOncanplay(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnclick(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOncanplay(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOndblclick(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOncanplaythrough(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOndblclick(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOncanplaythrough(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnerror(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnchange(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnerror(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnchange(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnfocus(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnclick(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnfocus(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnclick(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnkeydown(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOncontextmenu(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnkeydown(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOncontextmenu(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnkeypress(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOndblclick(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnkeypress(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndblclick(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnkeyup(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOndrag(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnkeyup(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndrag(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnload(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOndragend(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnload(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndragend(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnmousedown(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOndragenter(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnmousedown(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndragenter(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnmousemove(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOndragleave(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnmousemove(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndragleave(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnmouseout(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOndragover(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnmouseout(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndragover(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnmouseover(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOndragstart(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnmouseover(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndragstart(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnmouseup(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOndrop(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnmouseup(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndrop(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnmousewheel(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOndurationchange(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnmousewheel(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndurationchange(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnreset(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnemptied(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnreset(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnemptied(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnresize(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnended(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnresize(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnended(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnscroll(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnerror(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnscroll(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnerror(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnsearch(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnfocus(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnsearch(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnfocus(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnselect(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOninput(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnselect(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOninput(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnsubmit(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnkeydown(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnsubmit(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnkeydown(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnunload(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnkeypress(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnunload(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnkeypress(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnbeforeunload(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnkeyup(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnbeforeunload(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnkeyup(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnwebkitanimationstart(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnload(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnwebkitanimationstart(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnload(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnwebkitanimationiteration(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnloadeddata(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnwebkitanimationiteration(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnloadeddata(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnwebkitanimationend(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnloadedmetadata(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnwebkitanimationend(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnloadedmetadata(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowOnwebkittransitionend(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnloadstart(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; + UNUSED_PARAM(exec); DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); - imp->setOnwebkittransitionend(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnloadstart(globalObject->createJSAttributeEventListener(value)); } -void setJSDOMWindowStyleSheetConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOnmessage(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnmessage(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnmousedown(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnmousedown(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnmousemove(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnmousemove(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnmouseout(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnmouseout(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnmouseover(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnmouseover(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnmouseup(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnmouseup(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnmousewheel(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnmousewheel(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnoffline(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnoffline(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnonline(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnonline(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnpause(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnpause(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnplay(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnplay(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnplaying(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnplaying(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnprogress(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnprogress(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnratechange(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnratechange(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnresize(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnresize(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnscroll(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnscroll(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnseeked(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnseeked(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnseeking(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnseeking(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnselect(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnselect(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnstalled(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnstalled(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnstorage(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnstorage(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnsubmit(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnsubmit(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnsuspend(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnsuspend(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOntimeupdate(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOntimeupdate(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnunload(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnunload(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnvolumechange(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnvolumechange(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnwaiting(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnwaiting(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnreset(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnreset(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnsearch(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnsearch(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnwebkitanimationend(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnwebkitanimationend(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnwebkitanimationiteration(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnwebkitanimationiteration(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnwebkitanimationstart(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnwebkitanimationstart(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowOnwebkittransitionend(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + UNUSED_PARAM(exec); + DOMWindow* imp = static_cast<DOMWindow*>(static_cast<JSDOMWindow*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSDOMWindow*>(thisObject); + imp->setOnwebkittransitionend(globalObject->createJSAttributeEventListener(value)); +} + +void setJSDOMWindowStyleSheetConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2793,7 +3981,7 @@ void setJSDOMWindowStyleSheetConstructor(ExecState* exec, JSObject* thisObject, static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "StyleSheet"), value); } -void setJSDOMWindowCSSStyleSheetConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCSSStyleSheetConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2801,7 +3989,7 @@ void setJSDOMWindowCSSStyleSheetConstructor(ExecState* exec, JSObject* thisObjec static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CSSStyleSheet"), value); } -void setJSDOMWindowCSSValueConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCSSValueConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2809,7 +3997,7 @@ void setJSDOMWindowCSSValueConstructor(ExecState* exec, JSObject* thisObject, JS static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CSSValue"), value); } -void setJSDOMWindowCSSPrimitiveValueConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCSSPrimitiveValueConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2817,7 +4005,7 @@ void setJSDOMWindowCSSPrimitiveValueConstructor(ExecState* exec, JSObject* thisO static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CSSPrimitiveValue"), value); } -void setJSDOMWindowCSSValueListConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCSSValueListConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2825,7 +4013,7 @@ void setJSDOMWindowCSSValueListConstructor(ExecState* exec, JSObject* thisObject static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CSSValueList"), value); } -void setJSDOMWindowWebKitCSSTransformValueConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowWebKitCSSTransformValueConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2833,7 +4021,7 @@ void setJSDOMWindowWebKitCSSTransformValueConstructor(ExecState* exec, JSObject* static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "WebKitCSSTransformValue"), value); } -void setJSDOMWindowCSSRuleConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCSSRuleConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2841,7 +4029,7 @@ void setJSDOMWindowCSSRuleConstructor(ExecState* exec, JSObject* thisObject, JSV static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CSSRule"), value); } -void setJSDOMWindowCSSCharsetRuleConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCSSCharsetRuleConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2849,7 +4037,7 @@ void setJSDOMWindowCSSCharsetRuleConstructor(ExecState* exec, JSObject* thisObje static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CSSCharsetRule"), value); } -void setJSDOMWindowCSSFontFaceRuleConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCSSFontFaceRuleConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2857,7 +4045,7 @@ void setJSDOMWindowCSSFontFaceRuleConstructor(ExecState* exec, JSObject* thisObj static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CSSFontFaceRule"), value); } -void setJSDOMWindowCSSImportRuleConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCSSImportRuleConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2865,7 +4053,7 @@ void setJSDOMWindowCSSImportRuleConstructor(ExecState* exec, JSObject* thisObjec static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CSSImportRule"), value); } -void setJSDOMWindowCSSMediaRuleConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCSSMediaRuleConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2873,7 +4061,7 @@ void setJSDOMWindowCSSMediaRuleConstructor(ExecState* exec, JSObject* thisObject static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CSSMediaRule"), value); } -void setJSDOMWindowCSSPageRuleConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCSSPageRuleConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2881,7 +4069,7 @@ void setJSDOMWindowCSSPageRuleConstructor(ExecState* exec, JSObject* thisObject, static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CSSPageRule"), value); } -void setJSDOMWindowCSSStyleRuleConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCSSStyleRuleConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2889,7 +4077,7 @@ void setJSDOMWindowCSSStyleRuleConstructor(ExecState* exec, JSObject* thisObject static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CSSStyleRule"), value); } -void setJSDOMWindowCSSVariablesRuleConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCSSVariablesRuleConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2897,7 +4085,7 @@ void setJSDOMWindowCSSVariablesRuleConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CSSVariablesRule"), value); } -void setJSDOMWindowCSSVariablesDeclarationConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCSSVariablesDeclarationConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2905,7 +4093,7 @@ void setJSDOMWindowCSSVariablesDeclarationConstructor(ExecState* exec, JSObject* static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CSSVariablesDeclaration"), value); } -void setJSDOMWindowCSSStyleDeclarationConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCSSStyleDeclarationConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2913,7 +4101,7 @@ void setJSDOMWindowCSSStyleDeclarationConstructor(ExecState* exec, JSObject* thi static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CSSStyleDeclaration"), value); } -void setJSDOMWindowMediaListConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowMediaListConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2921,7 +4109,7 @@ void setJSDOMWindowMediaListConstructor(ExecState* exec, JSObject* thisObject, J static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "MediaList"), value); } -void setJSDOMWindowCounterConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCounterConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2929,7 +4117,7 @@ void setJSDOMWindowCounterConstructor(ExecState* exec, JSObject* thisObject, JSV static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Counter"), value); } -void setJSDOMWindowCSSRuleListConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCSSRuleListConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2937,7 +4125,7 @@ void setJSDOMWindowCSSRuleListConstructor(ExecState* exec, JSObject* thisObject, static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CSSRuleList"), value); } -void setJSDOMWindowRectConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowRectConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2945,7 +4133,7 @@ void setJSDOMWindowRectConstructor(ExecState* exec, JSObject* thisObject, JSValu static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Rect"), value); } -void setJSDOMWindowStyleSheetListConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowStyleSheetListConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2953,7 +4141,7 @@ void setJSDOMWindowStyleSheetListConstructor(ExecState* exec, JSObject* thisObje static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "StyleSheetList"), value); } -void setJSDOMWindowDOMExceptionConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowDOMExceptionConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2961,7 +4149,7 @@ void setJSDOMWindowDOMExceptionConstructor(ExecState* exec, JSObject* thisObject static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "DOMException"), value); } -void setJSDOMWindowDOMStringListConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowDOMStringListConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2969,7 +4157,7 @@ void setJSDOMWindowDOMStringListConstructor(ExecState* exec, JSObject* thisObjec static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "DOMStringList"), value); } -void setJSDOMWindowDOMImplementationConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowDOMImplementationConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2977,7 +4165,7 @@ void setJSDOMWindowDOMImplementationConstructor(ExecState* exec, JSObject* thisO static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "DOMImplementation"), value); } -void setJSDOMWindowDocumentFragmentConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowDocumentFragmentConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2985,7 +4173,7 @@ void setJSDOMWindowDocumentFragmentConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "DocumentFragment"), value); } -void setJSDOMWindowDocumentConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowDocumentConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -2993,7 +4181,7 @@ void setJSDOMWindowDocumentConstructor(ExecState* exec, JSObject* thisObject, JS static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Document"), value); } -void setJSDOMWindowNodeConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowNodeConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3001,7 +4189,7 @@ void setJSDOMWindowNodeConstructor(ExecState* exec, JSObject* thisObject, JSValu static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Node"), value); } -void setJSDOMWindowNodeListConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowNodeListConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3009,7 +4197,7 @@ void setJSDOMWindowNodeListConstructor(ExecState* exec, JSObject* thisObject, JS static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "NodeList"), value); } -void setJSDOMWindowNamedNodeMapConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowNamedNodeMapConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3017,7 +4205,7 @@ void setJSDOMWindowNamedNodeMapConstructor(ExecState* exec, JSObject* thisObject static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "NamedNodeMap"), value); } -void setJSDOMWindowCharacterDataConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCharacterDataConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3025,7 +4213,7 @@ void setJSDOMWindowCharacterDataConstructor(ExecState* exec, JSObject* thisObjec static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CharacterData"), value); } -void setJSDOMWindowAttrConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowAttrConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3033,7 +4221,7 @@ void setJSDOMWindowAttrConstructor(ExecState* exec, JSObject* thisObject, JSValu static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Attr"), value); } -void setJSDOMWindowElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3041,7 +4229,7 @@ void setJSDOMWindowElementConstructor(ExecState* exec, JSObject* thisObject, JSV static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Element"), value); } -void setJSDOMWindowTextConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowTextConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3049,7 +4237,7 @@ void setJSDOMWindowTextConstructor(ExecState* exec, JSObject* thisObject, JSValu static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Text"), value); } -void setJSDOMWindowCommentConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCommentConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3057,7 +4245,7 @@ void setJSDOMWindowCommentConstructor(ExecState* exec, JSObject* thisObject, JSV static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Comment"), value); } -void setJSDOMWindowCDATASectionConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowCDATASectionConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3065,7 +4253,7 @@ void setJSDOMWindowCDATASectionConstructor(ExecState* exec, JSObject* thisObject static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CDATASection"), value); } -void setJSDOMWindowDocumentTypeConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowDocumentTypeConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3073,7 +4261,7 @@ void setJSDOMWindowDocumentTypeConstructor(ExecState* exec, JSObject* thisObject static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "DocumentType"), value); } -void setJSDOMWindowNotationConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowNotationConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3081,7 +4269,7 @@ void setJSDOMWindowNotationConstructor(ExecState* exec, JSObject* thisObject, JS static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Notation"), value); } -void setJSDOMWindowEntityConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowEntityConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3089,7 +4277,7 @@ void setJSDOMWindowEntityConstructor(ExecState* exec, JSObject* thisObject, JSVa static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Entity"), value); } -void setJSDOMWindowEntityReferenceConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowEntityReferenceConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3097,7 +4285,7 @@ void setJSDOMWindowEntityReferenceConstructor(ExecState* exec, JSObject* thisObj static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "EntityReference"), value); } -void setJSDOMWindowProcessingInstructionConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowProcessingInstructionConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3105,7 +4293,7 @@ void setJSDOMWindowProcessingInstructionConstructor(ExecState* exec, JSObject* t static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "ProcessingInstruction"), value); } -void setJSDOMWindowHTMLDocumentConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLDocumentConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3113,7 +4301,7 @@ void setJSDOMWindowHTMLDocumentConstructor(ExecState* exec, JSObject* thisObject static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLDocument"), value); } -void setJSDOMWindowHTMLElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3121,7 +4309,7 @@ void setJSDOMWindowHTMLElementConstructor(ExecState* exec, JSObject* thisObject, static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLElement"), value); } -void setJSDOMWindowHTMLAnchorElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLAnchorElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3129,7 +4317,7 @@ void setJSDOMWindowHTMLAnchorElementConstructor(ExecState* exec, JSObject* thisO static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLAnchorElement"), value); } -void setJSDOMWindowHTMLAppletElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLAppletElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3137,7 +4325,7 @@ void setJSDOMWindowHTMLAppletElementConstructor(ExecState* exec, JSObject* thisO static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLAppletElement"), value); } -void setJSDOMWindowHTMLAreaElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLAreaElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3145,7 +4333,7 @@ void setJSDOMWindowHTMLAreaElementConstructor(ExecState* exec, JSObject* thisObj static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLAreaElement"), value); } -void setJSDOMWindowHTMLBRElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLBRElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3153,7 +4341,7 @@ void setJSDOMWindowHTMLBRElementConstructor(ExecState* exec, JSObject* thisObjec static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLBRElement"), value); } -void setJSDOMWindowHTMLBaseElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLBaseElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3161,7 +4349,7 @@ void setJSDOMWindowHTMLBaseElementConstructor(ExecState* exec, JSObject* thisObj static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLBaseElement"), value); } -void setJSDOMWindowHTMLBaseFontElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLBaseFontElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3169,7 +4357,7 @@ void setJSDOMWindowHTMLBaseFontElementConstructor(ExecState* exec, JSObject* thi static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLBaseFontElement"), value); } -void setJSDOMWindowHTMLBlockquoteElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLBlockquoteElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3177,7 +4365,7 @@ void setJSDOMWindowHTMLBlockquoteElementConstructor(ExecState* exec, JSObject* t static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLBlockquoteElement"), value); } -void setJSDOMWindowHTMLBodyElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLBodyElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3185,7 +4373,7 @@ void setJSDOMWindowHTMLBodyElementConstructor(ExecState* exec, JSObject* thisObj static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLBodyElement"), value); } -void setJSDOMWindowHTMLButtonElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLButtonElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3193,7 +4381,7 @@ void setJSDOMWindowHTMLButtonElementConstructor(ExecState* exec, JSObject* thisO static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLButtonElement"), value); } -void setJSDOMWindowHTMLCanvasElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLCanvasElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3201,7 +4389,7 @@ void setJSDOMWindowHTMLCanvasElementConstructor(ExecState* exec, JSObject* thisO static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLCanvasElement"), value); } -void setJSDOMWindowHTMLDListElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLDListElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3209,7 +4397,7 @@ void setJSDOMWindowHTMLDListElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLDListElement"), value); } -void setJSDOMWindowHTMLDirectoryElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLDirectoryElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3217,7 +4405,7 @@ void setJSDOMWindowHTMLDirectoryElementConstructor(ExecState* exec, JSObject* th static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLDirectoryElement"), value); } -void setJSDOMWindowHTMLDivElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLDivElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3225,7 +4413,7 @@ void setJSDOMWindowHTMLDivElementConstructor(ExecState* exec, JSObject* thisObje static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLDivElement"), value); } -void setJSDOMWindowHTMLEmbedElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLEmbedElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3233,7 +4421,7 @@ void setJSDOMWindowHTMLEmbedElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLEmbedElement"), value); } -void setJSDOMWindowHTMLFieldSetElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLFieldSetElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3241,7 +4429,7 @@ void setJSDOMWindowHTMLFieldSetElementConstructor(ExecState* exec, JSObject* thi static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLFieldSetElement"), value); } -void setJSDOMWindowHTMLFontElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLFontElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3249,7 +4437,7 @@ void setJSDOMWindowHTMLFontElementConstructor(ExecState* exec, JSObject* thisObj static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLFontElement"), value); } -void setJSDOMWindowHTMLFormElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLFormElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3257,7 +4445,7 @@ void setJSDOMWindowHTMLFormElementConstructor(ExecState* exec, JSObject* thisObj static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLFormElement"), value); } -void setJSDOMWindowHTMLFrameElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLFrameElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3265,7 +4453,7 @@ void setJSDOMWindowHTMLFrameElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLFrameElement"), value); } -void setJSDOMWindowHTMLFrameSetElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLFrameSetElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3273,7 +4461,7 @@ void setJSDOMWindowHTMLFrameSetElementConstructor(ExecState* exec, JSObject* thi static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLFrameSetElement"), value); } -void setJSDOMWindowHTMLHRElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLHRElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3281,7 +4469,7 @@ void setJSDOMWindowHTMLHRElementConstructor(ExecState* exec, JSObject* thisObjec static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLHRElement"), value); } -void setJSDOMWindowHTMLHeadElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLHeadElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3289,7 +4477,7 @@ void setJSDOMWindowHTMLHeadElementConstructor(ExecState* exec, JSObject* thisObj static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLHeadElement"), value); } -void setJSDOMWindowHTMLHeadingElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLHeadingElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3297,7 +4485,7 @@ void setJSDOMWindowHTMLHeadingElementConstructor(ExecState* exec, JSObject* this static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLHeadingElement"), value); } -void setJSDOMWindowHTMLHtmlElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLHtmlElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3305,7 +4493,7 @@ void setJSDOMWindowHTMLHtmlElementConstructor(ExecState* exec, JSObject* thisObj static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLHtmlElement"), value); } -void setJSDOMWindowHTMLIFrameElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLIFrameElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3313,7 +4501,7 @@ void setJSDOMWindowHTMLIFrameElementConstructor(ExecState* exec, JSObject* thisO static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLIFrameElement"), value); } -void setJSDOMWindowHTMLImageElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLImageElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3321,7 +4509,7 @@ void setJSDOMWindowHTMLImageElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLImageElement"), value); } -void setJSDOMWindowHTMLInputElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLInputElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3329,7 +4517,7 @@ void setJSDOMWindowHTMLInputElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLInputElement"), value); } -void setJSDOMWindowHTMLIsIndexElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLIsIndexElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3337,7 +4525,7 @@ void setJSDOMWindowHTMLIsIndexElementConstructor(ExecState* exec, JSObject* this static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLIsIndexElement"), value); } -void setJSDOMWindowHTMLLIElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLLIElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3345,7 +4533,7 @@ void setJSDOMWindowHTMLLIElementConstructor(ExecState* exec, JSObject* thisObjec static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLLIElement"), value); } -void setJSDOMWindowHTMLLabelElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLLabelElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3353,7 +4541,7 @@ void setJSDOMWindowHTMLLabelElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLLabelElement"), value); } -void setJSDOMWindowHTMLLegendElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLLegendElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3361,7 +4549,7 @@ void setJSDOMWindowHTMLLegendElementConstructor(ExecState* exec, JSObject* thisO static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLLegendElement"), value); } -void setJSDOMWindowHTMLLinkElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLLinkElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3369,7 +4557,7 @@ void setJSDOMWindowHTMLLinkElementConstructor(ExecState* exec, JSObject* thisObj static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLLinkElement"), value); } -void setJSDOMWindowHTMLMapElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLMapElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3377,7 +4565,7 @@ void setJSDOMWindowHTMLMapElementConstructor(ExecState* exec, JSObject* thisObje static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLMapElement"), value); } -void setJSDOMWindowHTMLMarqueeElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLMarqueeElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3385,7 +4573,7 @@ void setJSDOMWindowHTMLMarqueeElementConstructor(ExecState* exec, JSObject* this static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLMarqueeElement"), value); } -void setJSDOMWindowHTMLMenuElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLMenuElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3393,7 +4581,7 @@ void setJSDOMWindowHTMLMenuElementConstructor(ExecState* exec, JSObject* thisObj static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLMenuElement"), value); } -void setJSDOMWindowHTMLMetaElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLMetaElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3401,7 +4589,7 @@ void setJSDOMWindowHTMLMetaElementConstructor(ExecState* exec, JSObject* thisObj static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLMetaElement"), value); } -void setJSDOMWindowHTMLModElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLModElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3409,7 +4597,7 @@ void setJSDOMWindowHTMLModElementConstructor(ExecState* exec, JSObject* thisObje static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLModElement"), value); } -void setJSDOMWindowHTMLOListElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLOListElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3417,7 +4605,7 @@ void setJSDOMWindowHTMLOListElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLOListElement"), value); } -void setJSDOMWindowHTMLObjectElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLObjectElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3425,7 +4613,7 @@ void setJSDOMWindowHTMLObjectElementConstructor(ExecState* exec, JSObject* thisO static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLObjectElement"), value); } -void setJSDOMWindowHTMLOptGroupElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLOptGroupElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3433,7 +4621,7 @@ void setJSDOMWindowHTMLOptGroupElementConstructor(ExecState* exec, JSObject* thi static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLOptGroupElement"), value); } -void setJSDOMWindowHTMLOptionElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLOptionElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3441,7 +4629,7 @@ void setJSDOMWindowHTMLOptionElementConstructor(ExecState* exec, JSObject* thisO static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLOptionElement"), value); } -void setJSDOMWindowHTMLParagraphElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLParagraphElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3449,7 +4637,7 @@ void setJSDOMWindowHTMLParagraphElementConstructor(ExecState* exec, JSObject* th static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLParagraphElement"), value); } -void setJSDOMWindowHTMLParamElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLParamElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3457,7 +4645,7 @@ void setJSDOMWindowHTMLParamElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLParamElement"), value); } -void setJSDOMWindowHTMLPreElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLPreElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3465,7 +4653,7 @@ void setJSDOMWindowHTMLPreElementConstructor(ExecState* exec, JSObject* thisObje static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLPreElement"), value); } -void setJSDOMWindowHTMLQuoteElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLQuoteElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3473,7 +4661,7 @@ void setJSDOMWindowHTMLQuoteElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLQuoteElement"), value); } -void setJSDOMWindowHTMLScriptElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLScriptElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3481,7 +4669,7 @@ void setJSDOMWindowHTMLScriptElementConstructor(ExecState* exec, JSObject* thisO static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLScriptElement"), value); } -void setJSDOMWindowHTMLSelectElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLSelectElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3489,7 +4677,7 @@ void setJSDOMWindowHTMLSelectElementConstructor(ExecState* exec, JSObject* thisO static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLSelectElement"), value); } -void setJSDOMWindowHTMLStyleElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLStyleElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3497,7 +4685,7 @@ void setJSDOMWindowHTMLStyleElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLStyleElement"), value); } -void setJSDOMWindowHTMLTableCaptionElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLTableCaptionElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3505,7 +4693,7 @@ void setJSDOMWindowHTMLTableCaptionElementConstructor(ExecState* exec, JSObject* static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLTableCaptionElement"), value); } -void setJSDOMWindowHTMLTableCellElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLTableCellElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3513,7 +4701,7 @@ void setJSDOMWindowHTMLTableCellElementConstructor(ExecState* exec, JSObject* th static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLTableCellElement"), value); } -void setJSDOMWindowHTMLTableColElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLTableColElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3521,7 +4709,7 @@ void setJSDOMWindowHTMLTableColElementConstructor(ExecState* exec, JSObject* thi static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLTableColElement"), value); } -void setJSDOMWindowHTMLTableElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLTableElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3529,7 +4717,7 @@ void setJSDOMWindowHTMLTableElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLTableElement"), value); } -void setJSDOMWindowHTMLTableRowElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLTableRowElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3537,7 +4725,7 @@ void setJSDOMWindowHTMLTableRowElementConstructor(ExecState* exec, JSObject* thi static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLTableRowElement"), value); } -void setJSDOMWindowHTMLTableSectionElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLTableSectionElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3545,7 +4733,7 @@ void setJSDOMWindowHTMLTableSectionElementConstructor(ExecState* exec, JSObject* static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLTableSectionElement"), value); } -void setJSDOMWindowHTMLTextAreaElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLTextAreaElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3553,7 +4741,7 @@ void setJSDOMWindowHTMLTextAreaElementConstructor(ExecState* exec, JSObject* thi static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLTextAreaElement"), value); } -void setJSDOMWindowHTMLTitleElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLTitleElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3561,7 +4749,7 @@ void setJSDOMWindowHTMLTitleElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLTitleElement"), value); } -void setJSDOMWindowHTMLUListElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLUListElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3569,7 +4757,7 @@ void setJSDOMWindowHTMLUListElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLUListElement"), value); } -void setJSDOMWindowHTMLCollectionConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLCollectionConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3577,7 +4765,23 @@ void setJSDOMWindowHTMLCollectionConstructor(ExecState* exec, JSObject* thisObje static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLCollection"), value); } -void setJSDOMWindowCanvasRenderingContext2DConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowImageConstructor(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + // Shadowing a built-in constructor + static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Image"), value); +} + +void setJSDOMWindowOptionConstructor(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + // Shadowing a built-in constructor + static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Option"), value); +} + +void setJSDOMWindowCanvasRenderingContext2DConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3585,7 +4789,7 @@ void setJSDOMWindowCanvasRenderingContext2DConstructor(ExecState* exec, JSObject static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "CanvasRenderingContext2D"), value); } -void setJSDOMWindowTextMetricsConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowTextMetricsConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3593,7 +4797,7 @@ void setJSDOMWindowTextMetricsConstructor(ExecState* exec, JSObject* thisObject, static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "TextMetrics"), value); } -void setJSDOMWindowEventConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowEventConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3601,7 +4805,7 @@ void setJSDOMWindowEventConstructor(ExecState* exec, JSObject* thisObject, JSVal static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Event"), value); } -void setJSDOMWindowKeyboardEventConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowKeyboardEventConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3609,7 +4813,7 @@ void setJSDOMWindowKeyboardEventConstructor(ExecState* exec, JSObject* thisObjec static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "KeyboardEvent"), value); } -void setJSDOMWindowMouseEventConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowMouseEventConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3617,7 +4821,7 @@ void setJSDOMWindowMouseEventConstructor(ExecState* exec, JSObject* thisObject, static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "MouseEvent"), value); } -void setJSDOMWindowMutationEventConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowMutationEventConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3625,7 +4829,7 @@ void setJSDOMWindowMutationEventConstructor(ExecState* exec, JSObject* thisObjec static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "MutationEvent"), value); } -void setJSDOMWindowOverflowEventConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowOverflowEventConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3633,7 +4837,7 @@ void setJSDOMWindowOverflowEventConstructor(ExecState* exec, JSObject* thisObjec static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "OverflowEvent"), value); } -void setJSDOMWindowProgressEventConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowProgressEventConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3641,7 +4845,7 @@ void setJSDOMWindowProgressEventConstructor(ExecState* exec, JSObject* thisObjec static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "ProgressEvent"), value); } -void setJSDOMWindowTextEventConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowTextEventConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3649,7 +4853,7 @@ void setJSDOMWindowTextEventConstructor(ExecState* exec, JSObject* thisObject, J static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "TextEvent"), value); } -void setJSDOMWindowUIEventConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowUIEventConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3657,7 +4861,7 @@ void setJSDOMWindowUIEventConstructor(ExecState* exec, JSObject* thisObject, JSV static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "UIEvent"), value); } -void setJSDOMWindowWebKitAnimationEventConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowWebKitAnimationEventConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3665,7 +4869,7 @@ void setJSDOMWindowWebKitAnimationEventConstructor(ExecState* exec, JSObject* th static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "WebKitAnimationEvent"), value); } -void setJSDOMWindowWebKitTransitionEventConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowWebKitTransitionEventConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3673,7 +4877,7 @@ void setJSDOMWindowWebKitTransitionEventConstructor(ExecState* exec, JSObject* t static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "WebKitTransitionEvent"), value); } -void setJSDOMWindowWheelEventConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowWheelEventConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3681,7 +4885,7 @@ void setJSDOMWindowWheelEventConstructor(ExecState* exec, JSObject* thisObject, static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "WheelEvent"), value); } -void setJSDOMWindowMessageEventConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowMessageEventConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3689,7 +4893,7 @@ void setJSDOMWindowMessageEventConstructor(ExecState* exec, JSObject* thisObject static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "MessageEvent"), value); } -void setJSDOMWindowEventExceptionConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowEventExceptionConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3697,7 +4901,7 @@ void setJSDOMWindowEventExceptionConstructor(ExecState* exec, JSObject* thisObje static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "EventException"), value); } -void setJSDOMWindowWebKitCSSKeyframeRuleConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowWebKitCSSKeyframeRuleConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3705,7 +4909,7 @@ void setJSDOMWindowWebKitCSSKeyframeRuleConstructor(ExecState* exec, JSObject* t static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "WebKitCSSKeyframeRule"), value); } -void setJSDOMWindowWebKitCSSKeyframesRuleConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowWebKitCSSKeyframesRuleConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3713,7 +4917,23 @@ void setJSDOMWindowWebKitCSSKeyframesRuleConstructor(ExecState* exec, JSObject* static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "WebKitCSSKeyframesRule"), value); } -void setJSDOMWindowClipboardConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowWebKitCSSMatrixConstructor(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + // Shadowing a built-in constructor + static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "WebKitCSSMatrix"), value); +} + +void setJSDOMWindowWebKitPointConstructor(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + // Shadowing a built-in constructor + static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "WebKitPoint"), value); +} + +void setJSDOMWindowClipboardConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3721,7 +4941,7 @@ void setJSDOMWindowClipboardConstructor(ExecState* exec, JSObject* thisObject, J static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Clipboard"), value); } -void setJSDOMWindowFileConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowFileConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3729,7 +4949,7 @@ void setJSDOMWindowFileConstructor(ExecState* exec, JSObject* thisObject, JSValu static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "File"), value); } -void setJSDOMWindowFileListConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowFileListConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3737,7 +4957,7 @@ void setJSDOMWindowFileListConstructor(ExecState* exec, JSObject* thisObject, JS static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "FileList"), value); } -void setJSDOMWindowNodeFilterConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowNodeFilterConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3745,7 +4965,7 @@ void setJSDOMWindowNodeFilterConstructor(ExecState* exec, JSObject* thisObject, static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "NodeFilter"), value); } -void setJSDOMWindowRangeConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowRangeConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3753,7 +4973,7 @@ void setJSDOMWindowRangeConstructor(ExecState* exec, JSObject* thisObject, JSVal static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Range"), value); } -void setJSDOMWindowRangeExceptionConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowRangeExceptionConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3761,7 +4981,7 @@ void setJSDOMWindowRangeExceptionConstructor(ExecState* exec, JSObject* thisObje static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "RangeException"), value); } -void setJSDOMWindowXMLDocumentConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowXMLDocumentConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3769,7 +4989,7 @@ void setJSDOMWindowXMLDocumentConstructor(ExecState* exec, JSObject* thisObject, static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "XMLDocument"), value); } -void setJSDOMWindowDOMParserConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowDOMParserConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3777,7 +4997,7 @@ void setJSDOMWindowDOMParserConstructor(ExecState* exec, JSObject* thisObject, J static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "DOMParser"), value); } -void setJSDOMWindowXMLSerializerConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowXMLSerializerConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3785,7 +5005,15 @@ void setJSDOMWindowXMLSerializerConstructor(ExecState* exec, JSObject* thisObjec static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "XMLSerializer"), value); } -void setJSDOMWindowXMLHttpRequestUploadConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowXMLHttpRequestConstructor(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + // Shadowing a built-in constructor + static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "XMLHttpRequest"), value); +} + +void setJSDOMWindowXMLHttpRequestUploadConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3793,7 +5021,7 @@ void setJSDOMWindowXMLHttpRequestUploadConstructor(ExecState* exec, JSObject* th static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "XMLHttpRequestUpload"), value); } -void setJSDOMWindowXMLHttpRequestExceptionConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowXMLHttpRequestExceptionConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3801,7 +5029,15 @@ void setJSDOMWindowXMLHttpRequestExceptionConstructor(ExecState* exec, JSObject* static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "XMLHttpRequestException"), value); } -void setJSDOMWindowPluginConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowWorkerConstructor(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + // Shadowing a built-in constructor + static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Worker"), value); +} + +void setJSDOMWindowPluginConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3809,7 +5045,7 @@ void setJSDOMWindowPluginConstructor(ExecState* exec, JSObject* thisObject, JSVa static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Plugin"), value); } -void setJSDOMWindowPluginArrayConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowPluginArrayConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3817,7 +5053,7 @@ void setJSDOMWindowPluginArrayConstructor(ExecState* exec, JSObject* thisObject, static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "PluginArray"), value); } -void setJSDOMWindowMimeTypeConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowMimeTypeConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3825,7 +5061,7 @@ void setJSDOMWindowMimeTypeConstructor(ExecState* exec, JSObject* thisObject, JS static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "MimeType"), value); } -void setJSDOMWindowMimeTypeArrayConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowMimeTypeArrayConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3833,7 +5069,23 @@ void setJSDOMWindowMimeTypeArrayConstructor(ExecState* exec, JSObject* thisObjec static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "MimeTypeArray"), value); } -void setJSDOMWindowStorageConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowClientRectConstructor(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + // Shadowing a built-in constructor + static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "ClientRect"), value); +} + +void setJSDOMWindowClientRectListConstructor(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + // Shadowing a built-in constructor + static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "ClientRectList"), value); +} + +void setJSDOMWindowStorageConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3841,7 +5093,7 @@ void setJSDOMWindowStorageConstructor(ExecState* exec, JSObject* thisObject, JSV static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Storage"), value); } -void setJSDOMWindowStorageEventConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowStorageEventConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3849,7 +5101,15 @@ void setJSDOMWindowStorageEventConstructor(ExecState* exec, JSObject* thisObject static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "StorageEvent"), value); } -void setJSDOMWindowHTMLAudioElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowAudioConstructor(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) + return; + // Shadowing a built-in constructor + static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "Audio"), value); +} + +void setJSDOMWindowHTMLAudioElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3857,7 +5117,7 @@ void setJSDOMWindowHTMLAudioElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLAudioElement"), value); } -void setJSDOMWindowHTMLMediaElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLMediaElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3865,7 +5125,7 @@ void setJSDOMWindowHTMLMediaElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLMediaElement"), value); } -void setJSDOMWindowHTMLVideoElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowHTMLVideoElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3873,7 +5133,7 @@ void setJSDOMWindowHTMLVideoElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "HTMLVideoElement"), value); } -void setJSDOMWindowMediaErrorConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowMediaErrorConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3881,7 +5141,7 @@ void setJSDOMWindowMediaErrorConstructor(ExecState* exec, JSObject* thisObject, static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "MediaError"), value); } -void setJSDOMWindowXPathEvaluatorConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowXPathEvaluatorConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3889,7 +5149,7 @@ void setJSDOMWindowXPathEvaluatorConstructor(ExecState* exec, JSObject* thisObje static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "XPathEvaluator"), value); } -void setJSDOMWindowXPathResultConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowXPathResultConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3897,7 +5157,7 @@ void setJSDOMWindowXPathResultConstructor(ExecState* exec, JSObject* thisObject, static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "XPathResult"), value); } -void setJSDOMWindowXPathExceptionConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowXPathExceptionConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3905,7 +5165,7 @@ void setJSDOMWindowXPathExceptionConstructor(ExecState* exec, JSObject* thisObje static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "XPathException"), value); } -void setJSDOMWindowSVGAngleConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowSVGAngleConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3913,7 +5173,7 @@ void setJSDOMWindowSVGAngleConstructor(ExecState* exec, JSObject* thisObject, JS static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "SVGAngle"), value); } -void setJSDOMWindowSVGColorConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowSVGColorConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3921,7 +5181,7 @@ void setJSDOMWindowSVGColorConstructor(ExecState* exec, JSObject* thisObject, JS static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "SVGColor"), value); } -void setJSDOMWindowSVGExceptionConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowSVGExceptionConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3929,7 +5189,7 @@ void setJSDOMWindowSVGExceptionConstructor(ExecState* exec, JSObject* thisObject static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "SVGException"), value); } -void setJSDOMWindowSVGGradientElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowSVGGradientElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3937,7 +5197,7 @@ void setJSDOMWindowSVGGradientElementConstructor(ExecState* exec, JSObject* this static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "SVGGradientElement"), value); } -void setJSDOMWindowSVGLengthConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowSVGLengthConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3945,7 +5205,7 @@ void setJSDOMWindowSVGLengthConstructor(ExecState* exec, JSObject* thisObject, J static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "SVGLength"), value); } -void setJSDOMWindowSVGMarkerElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowSVGMarkerElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3953,7 +5213,7 @@ void setJSDOMWindowSVGMarkerElementConstructor(ExecState* exec, JSObject* thisOb static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "SVGMarkerElement"), value); } -void setJSDOMWindowSVGPaintConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowSVGPaintConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3961,7 +5221,7 @@ void setJSDOMWindowSVGPaintConstructor(ExecState* exec, JSObject* thisObject, JS static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "SVGPaint"), value); } -void setJSDOMWindowSVGPathSegConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowSVGPathSegConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3969,7 +5229,7 @@ void setJSDOMWindowSVGPathSegConstructor(ExecState* exec, JSObject* thisObject, static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "SVGPathSeg"), value); } -void setJSDOMWindowSVGPreserveAspectRatioConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowSVGPreserveAspectRatioConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3977,7 +5237,7 @@ void setJSDOMWindowSVGPreserveAspectRatioConstructor(ExecState* exec, JSObject* static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "SVGPreserveAspectRatio"), value); } -void setJSDOMWindowSVGRenderingIntentConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowSVGRenderingIntentConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3985,7 +5245,7 @@ void setJSDOMWindowSVGRenderingIntentConstructor(ExecState* exec, JSObject* this static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "SVGRenderingIntent"), value); } -void setJSDOMWindowSVGTextContentElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowSVGTextContentElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -3993,7 +5253,7 @@ void setJSDOMWindowSVGTextContentElementConstructor(ExecState* exec, JSObject* t static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "SVGTextContentElement"), value); } -void setJSDOMWindowSVGTextPathElementConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowSVGTextPathElementConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -4001,7 +5261,7 @@ void setJSDOMWindowSVGTextPathElementConstructor(ExecState* exec, JSObject* this static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "SVGTextPathElement"), value); } -void setJSDOMWindowSVGTransformConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowSVGTransformConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -4009,7 +5269,7 @@ void setJSDOMWindowSVGTransformConstructor(ExecState* exec, JSObject* thisObject static_cast<JSDOMWindow*>(thisObject)->putDirect(Identifier(exec, "SVGTransform"), value); } -void setJSDOMWindowSVGUnitTypesConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDOMWindowSVGUnitTypesConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) return; @@ -4024,9 +5284,10 @@ void JSDOMWindow::getPropertyNames(ExecState* exec, PropertyNameArray& propertyN Base::getPropertyNames(exec, propertyNames); } -JSValuePtr jsDOMWindowPrototypeFunctionGetSelection(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionGetSelection(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) @@ -4034,13 +5295,14 @@ JSValuePtr jsDOMWindowPrototypeFunctionGetSelection(ExecState* exec, JSObject*, DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getSelection())); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getSelection())); return result; } -JSValuePtr jsDOMWindowPrototypeFunctionFocus(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionFocus(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); @@ -4049,9 +5311,10 @@ JSValuePtr jsDOMWindowPrototypeFunctionFocus(ExecState* exec, JSObject*, JSValue return jsUndefined(); } -JSValuePtr jsDOMWindowPrototypeFunctionBlur(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionBlur(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); @@ -4060,9 +5323,10 @@ JSValuePtr jsDOMWindowPrototypeFunctionBlur(ExecState* exec, JSObject*, JSValueP return jsUndefined(); } -JSValuePtr jsDOMWindowPrototypeFunctionClose(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionClose(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); @@ -4071,9 +5335,10 @@ JSValuePtr jsDOMWindowPrototypeFunctionClose(ExecState* exec, JSObject*, JSValue return jsUndefined(); } -JSValuePtr jsDOMWindowPrototypeFunctionPrint(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionPrint(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) @@ -4084,9 +5349,10 @@ JSValuePtr jsDOMWindowPrototypeFunctionPrint(ExecState* exec, JSObject*, JSValue return jsUndefined(); } -JSValuePtr jsDOMWindowPrototypeFunctionStop(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionStop(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) @@ -4097,75 +5363,102 @@ JSValuePtr jsDOMWindowPrototypeFunctionStop(ExecState* exec, JSObject*, JSValueP return jsUndefined(); } -JSValuePtr jsDOMWindowPrototypeFunctionAlert(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionOpen(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); + if (!castedThisObj) + return throwError(exec, TypeError); + if (!castedThisObj->allowsAccessFrom(exec)) + return jsUndefined(); + return castedThisObj->open(exec, args); +} + +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionShowModalDialog(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); + if (!castedThisObj) + return throwError(exec, TypeError); + if (!castedThisObj->allowsAccessFrom(exec)) + return jsUndefined(); + return castedThisObj->showModalDialog(exec, args); +} + +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionAlert(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) return jsUndefined(); DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); - const UString& message = args.at(exec, 0)->toString(exec); + const UString& message = args.at(0).toString(exec); imp->alert(message); return jsUndefined(); } -JSValuePtr jsDOMWindowPrototypeFunctionConfirm(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionConfirm(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) return jsUndefined(); DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); - const UString& message = args.at(exec, 0)->toString(exec); + const UString& message = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->confirm(message)); + JSC::JSValue result = jsBoolean(imp->confirm(message)); return result; } -JSValuePtr jsDOMWindowPrototypeFunctionPrompt(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionPrompt(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) return jsUndefined(); DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); - const UString& message = args.at(exec, 0)->toString(exec); - const UString& defaultValue = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 1)); + const UString& message = args.at(0).toString(exec); + const UString& defaultValue = valueToStringWithUndefinedOrNullCheck(exec, args.at(1)); - JSC::JSValuePtr result = jsStringOrNull(exec, imp->prompt(message, defaultValue)); + JSC::JSValue result = jsStringOrNull(exec, imp->prompt(message, defaultValue)); return result; } -JSValuePtr jsDOMWindowPrototypeFunctionFind(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionFind(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) return jsUndefined(); DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); - const UString& string = args.at(exec, 0)->toString(exec); - bool caseSensitive = args.at(exec, 1)->toBoolean(exec); - bool backwards = args.at(exec, 2)->toBoolean(exec); - bool wrap = args.at(exec, 3)->toBoolean(exec); - bool wholeWord = args.at(exec, 4)->toBoolean(exec); - bool searchInFrames = args.at(exec, 5)->toBoolean(exec); - bool showDialog = args.at(exec, 6)->toBoolean(exec); + const UString& string = args.at(0).toString(exec); + bool caseSensitive = args.at(1).toBoolean(exec); + bool backwards = args.at(2).toBoolean(exec); + bool wrap = args.at(3).toBoolean(exec); + bool wholeWord = args.at(4).toBoolean(exec); + bool searchInFrames = args.at(5).toBoolean(exec); + bool showDialog = args.at(6).toBoolean(exec); - JSC::JSValuePtr result = jsBoolean(imp->find(string, caseSensitive, backwards, wrap, wholeWord, searchInFrames, showDialog)); + JSC::JSValue result = jsBoolean(imp->find(string, caseSensitive, backwards, wrap, wholeWord, searchInFrames, showDialog)); return result; } -JSValuePtr jsDOMWindowPrototypeFunctionScrollBy(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionScrollBy(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) @@ -4173,16 +5466,17 @@ JSValuePtr jsDOMWindowPrototypeFunctionScrollBy(ExecState* exec, JSObject*, JSVa DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); if (args.size() < 2) return jsUndefined(); - int x = args.at(exec, 0)->toInt32(exec); - int y = args.at(exec, 1)->toInt32(exec); + int x = args.at(0).toInt32(exec); + int y = args.at(1).toInt32(exec); imp->scrollBy(x, y); return jsUndefined(); } -JSValuePtr jsDOMWindowPrototypeFunctionScrollTo(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionScrollTo(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) @@ -4190,16 +5484,17 @@ JSValuePtr jsDOMWindowPrototypeFunctionScrollTo(ExecState* exec, JSObject*, JSVa DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); if (args.size() < 2) return jsUndefined(); - int x = args.at(exec, 0)->toInt32(exec); - int y = args.at(exec, 1)->toInt32(exec); + int x = args.at(0).toInt32(exec); + int y = args.at(1).toInt32(exec); imp->scrollTo(x, y); return jsUndefined(); } -JSValuePtr jsDOMWindowPrototypeFunctionScroll(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionScroll(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) @@ -4207,16 +5502,17 @@ JSValuePtr jsDOMWindowPrototypeFunctionScroll(ExecState* exec, JSObject*, JSValu DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); if (args.size() < 2) return jsUndefined(); - int x = args.at(exec, 0)->toInt32(exec); - int y = args.at(exec, 1)->toInt32(exec); + int x = args.at(0).toInt32(exec); + int y = args.at(1).toInt32(exec); imp->scroll(x, y); return jsUndefined(); } -JSValuePtr jsDOMWindowPrototypeFunctionMoveBy(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionMoveBy(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) @@ -4224,16 +5520,17 @@ JSValuePtr jsDOMWindowPrototypeFunctionMoveBy(ExecState* exec, JSObject*, JSValu DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); if (args.size() < 2) return jsUndefined(); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); imp->moveBy(x, y); return jsUndefined(); } -JSValuePtr jsDOMWindowPrototypeFunctionMoveTo(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionMoveTo(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) @@ -4241,16 +5538,17 @@ JSValuePtr jsDOMWindowPrototypeFunctionMoveTo(ExecState* exec, JSObject*, JSValu DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); if (args.size() < 2) return jsUndefined(); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); imp->moveTo(x, y); return jsUndefined(); } -JSValuePtr jsDOMWindowPrototypeFunctionResizeBy(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionResizeBy(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) @@ -4258,16 +5556,17 @@ JSValuePtr jsDOMWindowPrototypeFunctionResizeBy(ExecState* exec, JSObject*, JSVa DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); if (args.size() < 2) return jsUndefined(); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); imp->resizeBy(x, y); return jsUndefined(); } -JSValuePtr jsDOMWindowPrototypeFunctionResizeTo(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionResizeTo(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) @@ -4275,85 +5574,124 @@ JSValuePtr jsDOMWindowPrototypeFunctionResizeTo(ExecState* exec, JSObject*, JSVa DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); if (args.size() < 2) return jsUndefined(); - float width = args.at(exec, 0)->toFloat(exec); - float height = args.at(exec, 1)->toFloat(exec); + float width = args.at(0).toFloat(exec); + float height = args.at(1).toFloat(exec); imp->resizeTo(width, height); return jsUndefined(); } -JSValuePtr jsDOMWindowPrototypeFunctionGetComputedStyle(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionGetComputedStyle(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) return jsUndefined(); DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); - Element* element = toElement(args.at(exec, 0)); - const UString& pseudoElement = args.at(exec, 1)->toString(exec); + Element* element = toElement(args.at(0)); + const UString& pseudoElement = args.at(1).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getComputedStyle(element, pseudoElement))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getComputedStyle(element, pseudoElement))); return result; } -JSValuePtr jsDOMWindowPrototypeFunctionGetMatchedCSSRules(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionGetMatchedCSSRules(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) return jsUndefined(); DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); - Element* element = toElement(args.at(exec, 0)); - const UString& pseudoElement = args.at(exec, 1)->toString(exec); + Element* element = toElement(args.at(0)); + const UString& pseudoElement = args.at(1).toString(exec); int argsCount = args.size(); if (argsCount < 3) { - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getMatchedCSSRules(element, pseudoElement))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getMatchedCSSRules(element, pseudoElement))); return result; } - bool authorOnly = args.at(exec, 2)->toBoolean(exec); + bool authorOnly = args.at(2).toBoolean(exec); + + + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getMatchedCSSRules(element, pseudoElement, authorOnly))); + return result; +} + +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionWebkitConvertPointFromPageToNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); + if (!castedThisObj) + return throwError(exec, TypeError); + if (!castedThisObj->allowsAccessFrom(exec)) + return jsUndefined(); + DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); + Node* node = toNode(args.at(0)); + WebKitPoint* p = toWebKitPoint(args.at(1)); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getMatchedCSSRules(element, pseudoElement, authorOnly))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->webkitConvertPointFromPageToNode(node, p))); return result; } -JSValuePtr jsDOMWindowPrototypeFunctionOpenDatabase(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionWebkitConvertPointFromNodeToPage(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); + if (!castedThisObj) + return throwError(exec, TypeError); + if (!castedThisObj->allowsAccessFrom(exec)) + return jsUndefined(); + DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); + Node* node = toNode(args.at(0)); + WebKitPoint* p = toWebKitPoint(args.at(1)); + + + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->webkitConvertPointFromNodeToPage(node, p))); + return result; +} + +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionOpenDatabase(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) return jsUndefined(); DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& name = args.at(exec, 0)->toString(exec); - const UString& version = args.at(exec, 1)->toString(exec); - const UString& displayName = args.at(exec, 2)->toString(exec); - unsigned estimatedSize = args.at(exec, 3)->toInt32(exec); + const UString& name = args.at(0).toString(exec); + const UString& version = args.at(1).toString(exec); + const UString& displayName = args.at(2).toString(exec); + unsigned estimatedSize = args.at(3).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->openDatabase(name, version, displayName, estimatedSize, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->openDatabase(name, version, displayName, estimatedSize, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDOMWindowPrototypeFunctionPostMessage(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionPostMessage(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); return castedThisObj->postMessage(exec, args); } -JSValuePtr jsDOMWindowPrototypeFunctionSetTimeout(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionSetTimeout(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) @@ -4361,19 +5699,25 @@ JSValuePtr jsDOMWindowPrototypeFunctionSetTimeout(ExecState* exec, JSObject*, JS return castedThisObj->setTimeout(exec, args); } -JSValuePtr jsDOMWindowPrototypeFunctionClearTimeout(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionClearTimeout(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) return jsUndefined(); - return castedThisObj->clearTimeout(exec, args); + DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); + int handle = args.at(0).toInt32(exec); + + imp->clearTimeout(handle); + return jsUndefined(); } -JSValuePtr jsDOMWindowPrototypeFunctionSetInterval(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionSetInterval(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) @@ -4381,19 +5725,25 @@ JSValuePtr jsDOMWindowPrototypeFunctionSetInterval(ExecState* exec, JSObject*, J return castedThisObj->setInterval(exec, args); } -JSValuePtr jsDOMWindowPrototypeFunctionClearInterval(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionClearInterval(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) return jsUndefined(); - return castedThisObj->clearInterval(exec, args); + DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); + int handle = args.at(0).toInt32(exec); + + imp->clearInterval(handle); + return jsUndefined(); } -JSValuePtr jsDOMWindowPrototypeFunctionAtob(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionAtob(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) @@ -4401,9 +5751,10 @@ JSValuePtr jsDOMWindowPrototypeFunctionAtob(ExecState* exec, JSObject*, JSValueP return castedThisObj->atob(exec, args); } -JSValuePtr jsDOMWindowPrototypeFunctionBtoa(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionBtoa(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) @@ -4411,9 +5762,10 @@ JSValuePtr jsDOMWindowPrototypeFunctionBtoa(ExecState* exec, JSObject*, JSValueP return castedThisObj->btoa(exec, args); } -JSValuePtr jsDOMWindowPrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) @@ -4421,9 +5773,10 @@ JSValuePtr jsDOMWindowPrototypeFunctionAddEventListener(ExecState* exec, JSObjec return castedThisObj->addEventListener(exec, args); } -JSValuePtr jsDOMWindowPrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue); + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); if (!castedThisObj) return throwError(exec, TypeError); if (!castedThisObj->allowsAccessFrom(exec)) @@ -4431,5 +5784,51 @@ JSValuePtr jsDOMWindowPrototypeFunctionRemoveEventListener(ExecState* exec, JSOb return castedThisObj->removeEventListener(exec, args); } +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); + if (!castedThisObj) + return throwError(exec, TypeError); + if (!castedThisObj->allowsAccessFrom(exec)) + return jsUndefined(); + DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); + ExceptionCode ec = 0; + Event* evt = toEvent(args.at(0)); + + + JSC::JSValue result = jsBoolean(imp->dispatchEvent(evt, ec)); + setDOMException(exec, ec); + return result; +} + +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionCaptureEvents(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); + if (!castedThisObj) + return throwError(exec, TypeError); + if (!castedThisObj->allowsAccessFrom(exec)) + return jsUndefined(); + DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); + + imp->captureEvents(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionReleaseEvents(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + JSDOMWindow* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec)); + if (!castedThisObj) + return throwError(exec, TypeError); + if (!castedThisObj->allowsAccessFrom(exec)) + return jsUndefined(); + DOMWindow* imp = static_cast<DOMWindow*>(castedThisObj->impl()); + + imp->releaseEvents(); + return jsUndefined(); +} + } diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.h b/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.h index cea74aec81..ccab201be9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.h @@ -33,14 +33,15 @@ class JSDOMWindow : public JSDOMWindowBase { typedef JSDOMWindowBase Base; public: JSDOMWindow(PassRefPtr<JSC::Structure>, PassRefPtr<DOMWindow>, JSDOMWindowShell*); + virtual ~JSDOMWindow(); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); bool customGetOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); - bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); + bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType, JSC::ImplementsHasInstance | JSC::NeedsThisConversion)); } @@ -53,37 +54,49 @@ public: virtual bool getPropertyAttributes(JSC::ExecState*, const JSC::Identifier&, unsigned& attributes) const; virtual void defineGetter(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSObject* getterFunction); virtual void defineSetter(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSObject* setterFunction); - virtual JSC::JSValuePtr lookupGetter(JSC::ExecState*, const JSC::Identifier& propertyName); - virtual JSC::JSValuePtr lookupSetter(JSC::ExecState*, const JSC::Identifier& propertyName); + virtual JSC::JSValue lookupGetter(JSC::ExecState*, const JSC::Identifier& propertyName); + virtual JSC::JSValue lookupSetter(JSC::ExecState*, const JSC::Identifier& propertyName); // Custom attributes - void setLocation(JSC::ExecState*, JSC::JSValuePtr); + JSC::JSValue history(JSC::ExecState*) const; + JSC::JSValue location(JSC::ExecState*) const; + void setLocation(JSC::ExecState*, JSC::JSValue); + JSC::JSValue event(JSC::ExecState*) const; + JSC::JSValue crypto(JSC::ExecState*) const; + JSC::JSValue image(JSC::ExecState*) const; + JSC::JSValue option(JSC::ExecState*) const; + JSC::JSValue webKitCSSMatrix(JSC::ExecState*) const; + JSC::JSValue webKitPoint(JSC::ExecState*) const; + JSC::JSValue xmlHttpRequest(JSC::ExecState*) const; + JSC::JSValue worker(JSC::ExecState*) const; + JSC::JSValue audio(JSC::ExecState*) const; // Custom functions - JSC::JSValuePtr postMessage(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr setTimeout(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr clearTimeout(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr setInterval(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr clearInterval(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr atob(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr btoa(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr addEventListener(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr removeEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue open(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue showModalDialog(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue postMessage(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setTimeout(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setInterval(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue atob(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue btoa(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue addEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue removeEventListener(JSC::ExecState*, const JSC::ArgList&); DOMWindow* impl() const { return static_cast<DOMWindow*>(Base::impl()); } }; -DOMWindow* toDOMWindow(JSC::JSValuePtr); +DOMWindow* toDOMWindow(JSC::JSValue); class JSDOMWindowPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: void* operator new(size_t); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -92,478 +105,572 @@ public: // Functions -JSC::JSValuePtr jsDOMWindowPrototypeFunctionGetSelection(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionFocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionBlur(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionClose(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionPrint(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionStop(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionAlert(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionConfirm(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionPrompt(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionFind(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionScrollBy(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionScrollTo(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionScroll(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionMoveBy(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionMoveTo(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionResizeBy(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionResizeTo(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionGetComputedStyle(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionGetMatchedCSSRules(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionOpenDatabase(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionPostMessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionSetTimeout(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionClearTimeout(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionSetInterval(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionClearInterval(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionAtob(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionBtoa(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDOMWindowPrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionGetSelection(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionFocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionBlur(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionClose(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionPrint(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionStop(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionOpen(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionShowModalDialog(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionAlert(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionConfirm(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionPrompt(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionFind(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionScrollBy(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionScrollTo(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionScroll(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionMoveBy(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionMoveTo(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionResizeBy(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionResizeTo(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionGetComputedStyle(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionGetMatchedCSSRules(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionWebkitConvertPointFromPageToNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionWebkitConvertPointFromNodeToPage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionOpenDatabase(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionPostMessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionSetTimeout(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionClearTimeout(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionSetInterval(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionClearInterval(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionAtob(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionBtoa(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionCaptureEvents(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionReleaseEvents(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsDOMWindowScreen(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMWindowHistory(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMWindowLocationbar(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowLocationbar(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowMenubar(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowMenubar(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowPersonalbar(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowPersonalbar(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowScrollbars(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowScrollbars(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowStatusbar(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowStatusbar(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowToolbar(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowToolbar(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowNavigator(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowNavigator(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowClientInformation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowClientInformation(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowLocation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowLocation(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowFrameElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMWindowOffscreenBuffering(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOffscreenBuffering(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOuterHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOuterHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOuterWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOuterWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowInnerHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowInnerHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowInnerWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowInnerWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowScreenX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowScreenX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowScreenY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowScreenY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowScreenLeft(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowScreenLeft(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowScreenTop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowScreenTop(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowScrollX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowScrollX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowScrollY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowScrollY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowPageXOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMWindowPageYOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMWindowClosed(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMWindowLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowStatus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowStatus(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowDefaultStatus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowDefaultStatus(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowDefaultstatus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowDefaultstatus(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowSelf(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowSelf(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowWindow(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMWindowFrames(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowFrames(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOpener(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOpener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowParent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowParent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowTop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowTop(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowDocument(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMWindowDevicePixelRatio(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowDevicePixelRatio(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowApplicationCache(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMWindowSessionStorage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMWindowLocalStorage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDOMWindowConsole(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowConsole(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnabort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnabort(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnblur(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnblur(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnchange(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnchange(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnclick(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnclick(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOndblclick(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOndblclick(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnfocus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnfocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnkeydown(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnkeydown(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnkeypress(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnkeypress(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnkeyup(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnkeyup(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnload(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnmousedown(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnmousedown(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnmousemove(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnmousemove(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnmouseout(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnmouseout(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnmouseover(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnmouseover(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnmouseup(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnmouseup(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnmousewheel(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnmousewheel(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnreset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnreset(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnresize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnresize(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnscroll(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnscroll(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnsearch(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnsearch(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnselect(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnselect(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnsubmit(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnsubmit(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnunload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnunload(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnbeforeunload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnbeforeunload(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnwebkitanimationstart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnwebkitanimationstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnwebkitanimationiteration(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnwebkitanimationiteration(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnwebkitanimationend(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnwebkitanimationend(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOnwebkittransitionend(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOnwebkittransitionend(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowStyleSheetConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowStyleSheetConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCSSStyleSheetConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCSSStyleSheetConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCSSValueConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCSSValueConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCSSPrimitiveValueConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCSSPrimitiveValueConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCSSValueListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCSSValueListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowWebKitCSSTransformValueConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowWebKitCSSTransformValueConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCSSRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCSSRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCSSCharsetRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCSSCharsetRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCSSFontFaceRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCSSFontFaceRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCSSImportRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCSSImportRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCSSMediaRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCSSMediaRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCSSPageRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCSSPageRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCSSStyleRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCSSStyleRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCSSVariablesRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCSSVariablesRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCSSVariablesDeclarationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCSSVariablesDeclarationConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCSSStyleDeclarationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCSSStyleDeclarationConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowMediaListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowMediaListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCounterConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCounterConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCSSRuleListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCSSRuleListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowRectConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowRectConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowStyleSheetListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowStyleSheetListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowDOMExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowDOMExceptionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowDOMStringListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowDOMStringListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowDOMImplementationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowDOMImplementationConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowDocumentFragmentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowDocumentFragmentConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowDocumentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowDocumentConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowNodeConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowNodeConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowNodeListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowNodeListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowNamedNodeMapConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowNamedNodeMapConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCharacterDataConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCharacterDataConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowAttrConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowAttrConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowTextConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowTextConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCommentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCommentConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCDATASectionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCDATASectionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowDocumentTypeConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowDocumentTypeConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowNotationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowNotationConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowEntityConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowEntityConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowEntityReferenceConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowEntityReferenceConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowProcessingInstructionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowProcessingInstructionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLDocumentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLDocumentConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLAnchorElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLAnchorElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLAppletElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLAppletElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLAreaElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLAreaElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLBRElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLBRElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLBaseElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLBaseElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLBaseFontElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLBaseFontElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLBlockquoteElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLBlockquoteElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLBodyElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLBodyElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLButtonElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLButtonElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLCanvasElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLCanvasElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLDListElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLDListElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLDirectoryElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLDirectoryElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLDivElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLDivElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLEmbedElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLEmbedElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLFieldSetElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLFieldSetElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLFontElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLFontElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLFormElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLFormElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLFrameElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLFrameElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLFrameSetElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLFrameSetElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLHRElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLHRElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLHeadElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLHeadElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLHeadingElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLHeadingElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLHtmlElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLHtmlElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLIFrameElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLIFrameElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLImageElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLImageElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLInputElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLInputElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLIsIndexElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLIsIndexElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLLIElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLLIElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLLabelElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLLabelElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLLegendElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLLegendElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLLinkElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLLinkElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLMapElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLMapElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLMarqueeElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLMarqueeElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLMenuElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLMenuElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLMetaElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLMetaElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLModElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLModElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLOListElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLOListElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLObjectElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLObjectElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLOptGroupElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLOptGroupElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLOptionElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLOptionElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLParagraphElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLParagraphElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLParamElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLParamElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLPreElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLPreElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLQuoteElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLQuoteElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLScriptElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLScriptElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLSelectElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLSelectElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLStyleElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLStyleElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLTableCaptionElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLTableCaptionElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLTableCellElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLTableCellElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLTableColElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLTableColElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLTableElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLTableElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLTableRowElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLTableRowElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLTableSectionElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLTableSectionElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLTextAreaElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLTextAreaElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLTitleElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLTitleElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLUListElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLUListElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLCollectionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLCollectionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowCanvasRenderingContext2DConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowCanvasRenderingContext2DConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowTextMetricsConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowTextMetricsConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowKeyboardEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowKeyboardEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowMouseEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowMouseEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowMutationEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowMutationEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowOverflowEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowOverflowEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowProgressEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowProgressEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowTextEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowTextEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowUIEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowUIEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowWebKitAnimationEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowWebKitAnimationEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowWebKitTransitionEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowWebKitTransitionEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowWheelEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowWheelEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowMessageEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowMessageEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowEventExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowEventExceptionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowWebKitCSSKeyframeRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowWebKitCSSKeyframeRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowWebKitCSSKeyframesRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowWebKitCSSKeyframesRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowClipboardConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowClipboardConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowFileConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowFileConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowFileListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowFileListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowNodeFilterConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowNodeFilterConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowRangeConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowRangeConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowRangeExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowRangeExceptionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowXMLDocumentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowXMLDocumentConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowDOMParserConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowDOMParserConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowXMLSerializerConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowXMLSerializerConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowXMLHttpRequestUploadConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowXMLHttpRequestUploadConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowXMLHttpRequestExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowXMLHttpRequestExceptionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowPluginConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowPluginConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowPluginArrayConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowPluginArrayConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowMimeTypeConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowMimeTypeConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowMimeTypeArrayConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowMimeTypeArrayConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowStorageConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowStorageConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowStorageEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowStorageEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLAudioElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLAudioElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLMediaElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLMediaElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowHTMLVideoElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowHTMLVideoElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowMediaErrorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowMediaErrorConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowXPathEvaluatorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowXPathEvaluatorConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowXPathResultConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowXPathResultConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowXPathExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowXPathExceptionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowSVGAngleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowSVGAngleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowSVGColorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowSVGColorConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowSVGExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowSVGExceptionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowSVGGradientElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowSVGGradientElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowSVGLengthConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowSVGLengthConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowSVGMarkerElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowSVGMarkerElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowSVGPaintConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowSVGPaintConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowSVGPathSegConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowSVGPathSegConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowSVGPreserveAspectRatioConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowSVGPreserveAspectRatioConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowSVGRenderingIntentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowSVGRenderingIntentConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowSVGTextContentElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowSVGTextContentElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowSVGTextPathElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowSVGTextPathElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowSVGTransformConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowSVGTransformConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDOMWindowSVGUnitTypesConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDOMWindowSVGUnitTypesConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsDOMWindowScreen(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMWindowHistory(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMWindowLocationbar(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowLocationbar(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowMenubar(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowMenubar(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowPersonalbar(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowPersonalbar(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowScrollbars(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowScrollbars(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowStatusbar(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowStatusbar(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowToolbar(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowToolbar(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowNavigator(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowNavigator(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowClientInformation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowClientInformation(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowLocation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowLocation(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowEvent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCrypto(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMWindowFrameElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMWindowOffscreenBuffering(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOffscreenBuffering(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOuterHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOuterHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOuterWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOuterWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowInnerHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowInnerHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowInnerWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowInnerWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowScreenX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowScreenX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowScreenY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowScreenY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowScreenLeft(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowScreenLeft(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowScreenTop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowScreenTop(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowScrollX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowScrollX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowScrollY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowScrollY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowPageXOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMWindowPageYOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMWindowClosed(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMWindowLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowStatus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowStatus(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowDefaultStatus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowDefaultStatus(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowDefaultstatus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowDefaultstatus(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowSelf(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowSelf(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowWindow(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMWindowFrames(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowFrames(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOpener(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOpener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowParent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowParent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowTop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowTop(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowDocument(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMWindowDevicePixelRatio(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowDevicePixelRatio(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowApplicationCache(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMWindowSessionStorage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMWindowLocalStorage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDOMWindowConsole(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowConsole(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnabort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnabort(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnbeforeunload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnbeforeunload(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnblur(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnblur(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOncanplay(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOncanplay(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOncanplaythrough(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOncanplaythrough(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnchange(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnchange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnclick(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnclick(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOncontextmenu(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOncontextmenu(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOndblclick(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOndblclick(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOndrag(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOndrag(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOndragend(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOndragend(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOndragenter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOndragenter(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOndragleave(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOndragleave(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOndragover(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOndragover(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOndragstart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOndragstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOndrop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOndrop(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOndurationchange(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOndurationchange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnemptied(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnemptied(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnended(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnended(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnfocus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnfocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOninput(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOninput(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnkeydown(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnkeydown(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnkeypress(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnkeypress(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnkeyup(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnkeyup(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnload(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnloadeddata(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnloadeddata(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnloadedmetadata(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnloadedmetadata(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnloadstart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnloadstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnmessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnmessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnmousedown(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnmousedown(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnmousemove(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnmousemove(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnmouseout(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnmouseout(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnmouseover(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnmouseover(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnmouseup(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnmouseup(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnmousewheel(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnmousewheel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnoffline(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnoffline(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnonline(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnonline(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnpause(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnpause(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnplay(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnplay(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnplaying(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnplaying(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnprogress(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnprogress(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnratechange(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnratechange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnresize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnresize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnscroll(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnscroll(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnseeked(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnseeked(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnseeking(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnseeking(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnselect(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnselect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnstalled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnstalled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnstorage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnstorage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnsubmit(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnsubmit(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnsuspend(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnsuspend(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOntimeupdate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOntimeupdate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnunload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnunload(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnvolumechange(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnvolumechange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnwaiting(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnwaiting(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnreset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnreset(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnsearch(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnsearch(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnwebkitanimationend(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnwebkitanimationend(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnwebkitanimationiteration(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnwebkitanimationiteration(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnwebkitanimationstart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnwebkitanimationstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOnwebkittransitionend(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOnwebkittransitionend(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowStyleSheetConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowStyleSheetConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCSSStyleSheetConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCSSStyleSheetConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCSSValueConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCSSValueConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCSSPrimitiveValueConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCSSPrimitiveValueConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCSSValueListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCSSValueListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowWebKitCSSTransformValueConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowWebKitCSSTransformValueConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCSSRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCSSRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCSSCharsetRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCSSCharsetRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCSSFontFaceRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCSSFontFaceRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCSSImportRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCSSImportRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCSSMediaRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCSSMediaRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCSSPageRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCSSPageRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCSSStyleRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCSSStyleRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCSSVariablesRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCSSVariablesRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCSSVariablesDeclarationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCSSVariablesDeclarationConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCSSStyleDeclarationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCSSStyleDeclarationConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowMediaListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowMediaListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCounterConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCounterConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCSSRuleListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCSSRuleListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowRectConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowRectConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowStyleSheetListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowStyleSheetListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowDOMExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowDOMExceptionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowDOMStringListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowDOMStringListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowDOMImplementationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowDOMImplementationConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowDocumentFragmentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowDocumentFragmentConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowDocumentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowDocumentConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowNodeConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowNodeConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowNodeListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowNodeListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowNamedNodeMapConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowNamedNodeMapConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCharacterDataConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCharacterDataConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowAttrConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowAttrConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowTextConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowTextConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCommentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCommentConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCDATASectionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCDATASectionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowDocumentTypeConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowDocumentTypeConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowNotationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowNotationConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowEntityConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowEntityConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowEntityReferenceConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowEntityReferenceConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowProcessingInstructionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowProcessingInstructionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLDocumentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLDocumentConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLAnchorElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLAnchorElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLAppletElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLAppletElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLAreaElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLAreaElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLBRElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLBRElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLBaseElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLBaseElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLBaseFontElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLBaseFontElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLBlockquoteElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLBlockquoteElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLBodyElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLBodyElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLButtonElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLButtonElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLCanvasElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLCanvasElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLDListElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLDListElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLDirectoryElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLDirectoryElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLDivElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLDivElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLEmbedElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLEmbedElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLFieldSetElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLFieldSetElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLFontElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLFontElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLFormElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLFormElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLFrameElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLFrameElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLFrameSetElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLFrameSetElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLHRElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLHRElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLHeadElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLHeadElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLHeadingElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLHeadingElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLHtmlElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLHtmlElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLIFrameElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLIFrameElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLImageElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLImageElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLInputElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLInputElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLIsIndexElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLIsIndexElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLLIElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLLIElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLLabelElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLLabelElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLLegendElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLLegendElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLLinkElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLLinkElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLMapElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLMapElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLMarqueeElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLMarqueeElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLMenuElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLMenuElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLMetaElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLMetaElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLModElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLModElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLOListElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLOListElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLObjectElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLObjectElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLOptGroupElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLOptGroupElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLOptionElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLOptionElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLParagraphElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLParagraphElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLParamElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLParamElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLPreElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLPreElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLQuoteElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLQuoteElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLScriptElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLScriptElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLSelectElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLSelectElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLStyleElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLStyleElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLTableCaptionElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLTableCaptionElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLTableCellElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLTableCellElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLTableColElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLTableColElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLTableElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLTableElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLTableRowElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLTableRowElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLTableSectionElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLTableSectionElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLTextAreaElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLTextAreaElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLTitleElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLTitleElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLUListElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLUListElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLCollectionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLCollectionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowImageConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowImageConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOptionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowCanvasRenderingContext2DConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowCanvasRenderingContext2DConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowTextMetricsConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowTextMetricsConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowKeyboardEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowKeyboardEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowMouseEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowMouseEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowMutationEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowMutationEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowOverflowEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowOverflowEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowProgressEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowProgressEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowTextEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowTextEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowUIEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowUIEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowWebKitAnimationEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowWebKitAnimationEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowWebKitTransitionEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowWebKitTransitionEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowWheelEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowWheelEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowMessageEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowMessageEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowEventExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowEventExceptionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowWebKitCSSKeyframeRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowWebKitCSSKeyframeRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowWebKitCSSKeyframesRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowWebKitCSSKeyframesRuleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowWebKitCSSMatrixConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowWebKitCSSMatrixConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowWebKitPointConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowWebKitPointConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowClipboardConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowClipboardConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowFileConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowFileConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowFileListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowFileListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowNodeFilterConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowNodeFilterConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowRangeConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowRangeConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowRangeExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowRangeExceptionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowXMLDocumentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowXMLDocumentConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowDOMParserConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowDOMParserConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowXMLSerializerConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowXMLSerializerConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowXMLHttpRequestConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowXMLHttpRequestConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowXMLHttpRequestUploadConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowXMLHttpRequestUploadConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowXMLHttpRequestExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowXMLHttpRequestExceptionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowWorkerConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowWorkerConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowPluginConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowPluginConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowPluginArrayConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowPluginArrayConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowMimeTypeConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowMimeTypeConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowMimeTypeArrayConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowMimeTypeArrayConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowClientRectConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowClientRectConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowClientRectListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowClientRectListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowStorageConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowStorageConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowStorageEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowStorageEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowAudioConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowAudioConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLAudioElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLAudioElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLMediaElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLMediaElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowHTMLVideoElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowHTMLVideoElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowMediaErrorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowMediaErrorConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowXPathEvaluatorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowXPathEvaluatorConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowXPathResultConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowXPathResultConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowXPathExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowXPathExceptionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowSVGAngleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowSVGAngleConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowSVGColorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowSVGColorConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowSVGExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowSVGExceptionConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowSVGGradientElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowSVGGradientElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowSVGLengthConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowSVGLengthConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowSVGMarkerElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowSVGMarkerElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowSVGPaintConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowSVGPaintConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowSVGPathSegConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowSVGPathSegConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowSVGPreserveAspectRatioConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowSVGPreserveAspectRatioConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowSVGRenderingIntentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowSVGRenderingIntentConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowSVGTextContentElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowSVGTextContentElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowSVGTextPathElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowSVGTextPathElementConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowSVGTransformConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowSVGTransformConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowSVGUnitTypesConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowSVGUnitTypesConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMWindowBase.lut.h b/src/3rdparty/webkit/WebCore/generated/JSDOMWindowBase.lut.h index d32e184a27..e69de29bb2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMWindowBase.lut.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMWindowBase.lut.h @@ -1,31 +0,0 @@ -// Automatically generated from ../bindings/js/JSDOMWindowBase.cpp using WebCore/../JavaScriptCore/create_hash_table. DO NOT EDIT! - -namespace WebCore { - -using namespace JSC; - -static const struct HashTableValue JSDOMWindowBaseTableValues[14] = { - { "open", DontDelete|Function, (intptr_t)windowProtoFuncOpen, (intptr_t)3 }, - { "showModalDialog", DontDelete|Function, (intptr_t)windowProtoFuncShowModalDialog, (intptr_t)1 }, - { "captureEvents", DontDelete|Function, (intptr_t)windowProtoFuncNotImplemented, (intptr_t)0 }, - { "releaseEvents", DontDelete|Function, (intptr_t)windowProtoFuncNotImplemented, (intptr_t)0 }, - { "crypto", DontDelete|ReadOnly, (intptr_t)jsDOMWindowBaseCrypto, (intptr_t)0 }, - { "event", DontDelete, (intptr_t)jsDOMWindowBaseEvent, (intptr_t)setJSDOMWindowBaseEvent }, - { "Audio", DontDelete, (intptr_t)jsDOMWindowBaseAudio, (intptr_t)setJSDOMWindowBaseAudio }, - { "Image", DontDelete, (intptr_t)jsDOMWindowBaseImage, (intptr_t)setJSDOMWindowBaseImage }, - { "MessageChannel", DontDelete, (intptr_t)jsDOMWindowBaseMessageChannel, (intptr_t)setJSDOMWindowBaseMessageChannel }, - { "Option", DontDelete, (intptr_t)jsDOMWindowBaseOption, (intptr_t)setJSDOMWindowBaseOption }, - { "Worker", DontDelete, (intptr_t)jsDOMWindowBaseWorker, (intptr_t)setJSDOMWindowBaseWorker }, - { "XMLHttpRequest", DontDelete, (intptr_t)jsDOMWindowBaseXMLHttpRequest, (intptr_t)setJSDOMWindowBaseXMLHttpRequest }, - { "XSLTProcessor", DontDelete, (intptr_t)jsDOMWindowBaseXSLTProcessor, (intptr_t)setJSDOMWindowBaseXSLTProcessor }, - { 0, 0, 0, 0 } -}; - -extern const struct HashTable JSDOMWindowBaseTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 63, JSDOMWindowBaseTableValues, 0 }; -#else - { 34, 31, JSDOMWindowBaseTableValues, 0 }; -#endif - -} // namespace diff --git a/src/3rdparty/webkit/WebCore/generated/JSDatabase.cpp b/src/3rdparty/webkit/WebCore/generated/JSDatabase.cpp index e663c52068..76f3fc42f1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDatabase.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDatabase.cpp @@ -20,6 +20,9 @@ #include "config.h" + +#if ENABLE(DATABASE) + #include "JSDatabase.h" #include <wtf/GetPtr.h> @@ -34,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSDatabase) +ASSERT_CLASS_FITS_IN_CELL(JSDatabase); /* Hash table */ @@ -69,9 +72,9 @@ static const HashTable JSDatabasePrototypeTable = const ClassInfo JSDatabasePrototype::s_info = { "DatabasePrototype", 0, &JSDatabasePrototypeTable, 0 }; -JSObject* JSDatabasePrototype::self(ExecState* exec) +JSObject* JSDatabasePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSDatabase>(exec); + return getDOMPrototype<JSDatabase>(exec, globalObject); } bool JSDatabasePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -90,12 +93,11 @@ JSDatabase::JSDatabase(PassRefPtr<Structure> structure, PassRefPtr<Database> imp JSDatabase::~JSDatabase() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSDatabase::createPrototype(ExecState* exec) +JSObject* JSDatabase::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSDatabasePrototype(JSDatabasePrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSDatabasePrototype(JSDatabasePrototype::createStructure(globalObject->objectPrototype())); } bool JSDatabase::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -103,35 +105,40 @@ bool JSDatabase::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN return getStaticValueSlot<JSDatabase, Base>(exec, &JSDatabaseTable, this, propertyName, slot); } -JSValuePtr jsDatabaseVersion(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDatabaseVersion(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Database* imp = static_cast<Database*>(static_cast<JSDatabase*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->version()); } -JSValuePtr jsDatabasePrototypeFunctionChangeVersion(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDatabasePrototypeFunctionChangeVersion(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDatabase::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDatabase::s_info)) return throwError(exec, TypeError); JSDatabase* castedThisObj = static_cast<JSDatabase*>(asObject(thisValue)); return castedThisObj->changeVersion(exec, args); } -JSValuePtr jsDatabasePrototypeFunctionTransaction(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDatabasePrototypeFunctionTransaction(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDatabase::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDatabase::s_info)) return throwError(exec, TypeError); JSDatabase* castedThisObj = static_cast<JSDatabase*>(asObject(thisValue)); return castedThisObj->transaction(exec, args); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, Database* object) +JSC::JSValue toJS(JSC::ExecState* exec, Database* object) { return getDOMObjectWrapper<JSDatabase>(exec, object); } -Database* toDatabase(JSC::JSValuePtr value) +Database* toDatabase(JSC::JSValue value) { - return value->isObject(&JSDatabase::s_info) ? static_cast<JSDatabase*>(asObject(value))->impl() : 0; + return value.isObject(&JSDatabase::s_info) ? static_cast<JSDatabase*>(asObject(value))->impl() : 0; } } + +#endif // ENABLE(DATABASE) diff --git a/src/3rdparty/webkit/WebCore/generated/JSDatabase.h b/src/3rdparty/webkit/WebCore/generated/JSDatabase.h index f0642e7128..d9eee5886b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDatabase.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDatabase.h @@ -21,6 +21,9 @@ #ifndef JSDatabase_h #define JSDatabase_h + +#if ENABLE(DATABASE) + #include "JSDOMBinding.h" #include <runtime/JSGlobalObject.h> #include <runtime/ObjectPrototype.h> @@ -34,36 +37,37 @@ class JSDatabase : public DOMObject { public: JSDatabase(PassRefPtr<JSC::Structure>, PassRefPtr<Database>); virtual ~JSDatabase(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } // Custom functions - JSC::JSValuePtr changeVersion(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr transaction(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue changeVersion(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue transaction(JSC::ExecState*, const JSC::ArgList&); Database* impl() const { return m_impl.get(); } private: RefPtr<Database> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, Database*); -Database* toDatabase(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, Database*); +Database* toDatabase(JSC::JSValue); class JSDatabasePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -72,12 +76,14 @@ public: // Functions -JSC::JSValuePtr jsDatabasePrototypeFunctionChangeVersion(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDatabasePrototypeFunctionTransaction(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDatabasePrototypeFunctionChangeVersion(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDatabasePrototypeFunctionTransaction(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsDatabaseVersion(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDatabaseVersion(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore +#endif // ENABLE(DATABASE) + #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSDocument.cpp b/src/3rdparty/webkit/WebCore/generated/JSDocument.cpp index 13b73f9aac..545a048363 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDocument.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDocument.cpp @@ -92,7 +92,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSDocument) +ASSERT_CLASS_FITS_IN_CELL(JSDocument); /* Hash table */ @@ -157,13 +157,13 @@ public: JSDocumentConstructor(ExecState* exec) : DOMObject(JSDocumentConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSDocumentPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSDocumentPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -228,9 +228,9 @@ static const HashTable JSDocumentPrototypeTable = const ClassInfo JSDocumentPrototype::s_info = { "DocumentPrototype", 0, &JSDocumentPrototypeTable, 0 }; -JSObject* JSDocumentPrototype::self(ExecState* exec) +JSObject* JSDocumentPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSDocument>(exec); + return getDOMPrototype<JSDocument>(exec, globalObject); } bool JSDocumentPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -238,10 +238,10 @@ bool JSDocumentPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticFunctionSlot<JSObject>(exec, &JSDocumentPrototypeTable, this, propertyName, slot); } -const ClassInfo JSDocument::s_info = { "Document", &JSEventTargetNode::s_info, &JSDocumentTable, 0 }; +const ClassInfo JSDocument::s_info = { "Document", &JSNode::s_info, &JSDocumentTable, 0 }; JSDocument::JSDocument(PassRefPtr<Structure> structure, PassRefPtr<Document> impl) - : JSEventTargetNode(structure, impl) + : JSNode(structure, impl) { } @@ -250,194 +250,222 @@ JSDocument::~JSDocument() forgetDOMObject(*Heap::heap(this)->globalData(), static_cast<Document*>(impl())); } -JSObject* JSDocument::createPrototype(ExecState* exec) +JSObject* JSDocument::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSDocumentPrototype(JSDocumentPrototype::createStructure(JSEventTargetNodePrototype::self(exec))); + return new (exec) JSDocumentPrototype(JSDocumentPrototype::createStructure(JSNodePrototype::self(exec, globalObject))); } -JSValuePtr jsDocumentDoctype(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentDoctype(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->doctype())); } -JSValuePtr jsDocumentImplementation(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentImplementation(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->implementation())); } -JSValuePtr jsDocumentDocumentElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentDocumentElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->documentElement())); } -JSValuePtr jsDocumentInputEncoding(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentInputEncoding(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->inputEncoding()); } -JSValuePtr jsDocumentXMLEncoding(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentXMLEncoding(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->xmlEncoding()); } -JSValuePtr jsDocumentXMLVersion(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentXMLVersion(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->xmlVersion()); } -JSValuePtr jsDocumentXMLStandalone(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentXMLStandalone(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->xmlStandalone()); } -JSValuePtr jsDocumentDocumentURI(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentDocumentURI(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->documentURI()); } -JSValuePtr jsDocumentDefaultView(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentDefaultView(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->defaultView())); } -JSValuePtr jsDocumentStyleSheets(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentStyleSheets(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->styleSheets())); } -JSValuePtr jsDocumentTitle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentTitle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->title()); } -JSValuePtr jsDocumentReferrer(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentReferrer(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->referrer()); } -JSValuePtr jsDocumentDomain(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentDomain(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->domain()); } -JSValuePtr jsDocumentURL(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentURL(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->url()); } -JSValuePtr jsDocumentCookie(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentCookie(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->cookie()); } -JSValuePtr jsDocumentBody(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentBody(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->body())); } -JSValuePtr jsDocumentImages(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentImages(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->images())); } -JSValuePtr jsDocumentApplets(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentApplets(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->applets())); } -JSValuePtr jsDocumentLinks(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentLinks(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->links())); } -JSValuePtr jsDocumentForms(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentForms(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->forms())); } -JSValuePtr jsDocumentAnchors(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentAnchors(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->anchors())); } -JSValuePtr jsDocumentLastModified(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentLastModified(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->lastModified()); } -JSValuePtr jsDocumentLocation(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentLocation(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSDocument*>(asObject(slot.slotBase()))->location(exec); } -JSValuePtr jsDocumentCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsStringOrUndefined(exec, imp->charset()); } -JSValuePtr jsDocumentDefaultCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentDefaultCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsStringOrUndefined(exec, imp->defaultCharset()); } -JSValuePtr jsDocumentReadyState(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentReadyState(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsStringOrUndefined(exec, imp->readyState()); } -JSValuePtr jsDocumentCharacterSet(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentCharacterSet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->characterSet()); } -JSValuePtr jsDocumentPreferredStylesheetSet(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentPreferredStylesheetSet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->preferredStylesheetSet()); } -JSValuePtr jsDocumentSelectedStylesheetSet(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentSelectedStylesheetSet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Document* imp = static_cast<Document*>(static_cast<JSDocument*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->selectedStylesheetSet()); } -JSValuePtr jsDocumentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSDocument*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSDocument::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSDocument::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSDocument, Base>(exec, propertyName, value, &JSDocumentTable, this, slot); } -void setJSDocumentXMLVersion(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDocumentXMLVersion(ExecState* exec, JSObject* thisObject, JSValue value) { Document* imp = static_cast<Document*>(static_cast<JSDocument*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -445,39 +473,39 @@ void setJSDocumentXMLVersion(ExecState* exec, JSObject* thisObject, JSValuePtr v setDOMException(exec, ec); } -void setJSDocumentXMLStandalone(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDocumentXMLStandalone(ExecState* exec, JSObject* thisObject, JSValue value) { Document* imp = static_cast<Document*>(static_cast<JSDocument*>(thisObject)->impl()); ExceptionCode ec = 0; - imp->setXMLStandalone(value->toBoolean(exec), ec); + imp->setXMLStandalone(value.toBoolean(exec), ec); setDOMException(exec, ec); } -void setJSDocumentDocumentURI(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDocumentDocumentURI(ExecState* exec, JSObject* thisObject, JSValue value) { Document* imp = static_cast<Document*>(static_cast<JSDocument*>(thisObject)->impl()); imp->setDocumentURI(valueToStringWithNullCheck(exec, value)); } -void setJSDocumentTitle(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDocumentTitle(ExecState* exec, JSObject* thisObject, JSValue value) { Document* imp = static_cast<Document*>(static_cast<JSDocument*>(thisObject)->impl()); imp->setTitle(valueToStringWithNullCheck(exec, value)); } -void setJSDocumentDomain(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDocumentDomain(ExecState* exec, JSObject* thisObject, JSValue value) { Document* imp = static_cast<Document*>(static_cast<JSDocument*>(thisObject)->impl()); imp->setDomain(valueToStringWithNullCheck(exec, value)); } -void setJSDocumentCookie(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDocumentCookie(ExecState* exec, JSObject* thisObject, JSValue value) { Document* imp = static_cast<Document*>(static_cast<JSDocument*>(thisObject)->impl()); imp->setCookie(valueToStringWithNullCheck(exec, value)); } -void setJSDocumentBody(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDocumentBody(ExecState* exec, JSObject* thisObject, JSValue value) { Document* imp = static_cast<Document*>(static_cast<JSDocument*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -485,565 +513,601 @@ void setJSDocumentBody(ExecState* exec, JSObject* thisObject, JSValuePtr value) setDOMException(exec, ec); } -void setJSDocumentLocation(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDocumentLocation(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSDocument*>(thisObject)->setLocation(exec, value); } -void setJSDocumentCharset(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDocumentCharset(ExecState* exec, JSObject* thisObject, JSValue value) { Document* imp = static_cast<Document*>(static_cast<JSDocument*>(thisObject)->impl()); imp->setCharset(valueToStringWithNullCheck(exec, value)); } -void setJSDocumentSelectedStylesheetSet(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSDocumentSelectedStylesheetSet(ExecState* exec, JSObject* thisObject, JSValue value) { Document* imp = static_cast<Document*>(static_cast<JSDocument*>(thisObject)->impl()); imp->setSelectedStylesheetSet(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSDocument::getConstructor(ExecState* exec) +JSValue JSDocument::getConstructor(ExecState* exec) { return getDOMConstructor<JSDocumentConstructor>(exec); } -JSValuePtr jsDocumentPrototypeFunctionCreateElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& tagName = valueToStringWithNullCheck(exec, args.at(exec, 0)); + const UString& tagName = valueToStringWithNullCheck(exec, args.at(0)); - JSC::JSValuePtr result = toJSNewlyCreated(exec, WTF::getPtr(imp->createElement(tagName, ec))); + JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createElement(tagName, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDocumentPrototypeFunctionCreateDocumentFragment(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateDocumentFragment(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createDocumentFragment())); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createDocumentFragment())); return result; } -JSValuePtr jsDocumentPrototypeFunctionCreateTextNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateTextNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - const UString& data = args.at(exec, 0)->toString(exec); + const UString& data = args.at(0).toString(exec); - JSC::JSValuePtr result = toJSNewlyCreated(exec, WTF::getPtr(imp->createTextNode(data))); + JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createTextNode(data))); return result; } -JSValuePtr jsDocumentPrototypeFunctionCreateComment(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateComment(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - const UString& data = args.at(exec, 0)->toString(exec); + const UString& data = args.at(0).toString(exec); - JSC::JSValuePtr result = toJSNewlyCreated(exec, WTF::getPtr(imp->createComment(data))); + JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createComment(data))); return result; } -JSValuePtr jsDocumentPrototypeFunctionCreateCDATASection(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateCDATASection(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& data = args.at(exec, 0)->toString(exec); + const UString& data = args.at(0).toString(exec); - JSC::JSValuePtr result = toJSNewlyCreated(exec, WTF::getPtr(imp->createCDATASection(data, ec))); + JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createCDATASection(data, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDocumentPrototypeFunctionCreateProcessingInstruction(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateProcessingInstruction(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& target = args.at(exec, 0)->toString(exec); - const UString& data = args.at(exec, 1)->toString(exec); + const UString& target = args.at(0).toString(exec); + const UString& data = args.at(1).toString(exec); - JSC::JSValuePtr result = toJSNewlyCreated(exec, WTF::getPtr(imp->createProcessingInstruction(target, data, ec))); + JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createProcessingInstruction(target, data, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDocumentPrototypeFunctionCreateAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJSNewlyCreated(exec, WTF::getPtr(imp->createAttribute(name, ec))); + JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createAttribute(name, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDocumentPrototypeFunctionCreateEntityReference(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateEntityReference(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJSNewlyCreated(exec, WTF::getPtr(imp->createEntityReference(name, ec))); + JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createEntityReference(name, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDocumentPrototypeFunctionGetElementsByTagName(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetElementsByTagName(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - const UString& tagname = args.at(exec, 0)->toString(exec); + const UString& tagname = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getElementsByTagName(tagname))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getElementsByTagName(tagname))); return result; } -JSValuePtr jsDocumentPrototypeFunctionImportNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionImportNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* importedNode = toNode(args.at(exec, 0)); - bool deep = args.at(exec, 1)->toBoolean(exec); + Node* importedNode = toNode(args.at(0)); + bool deep = args.at(1).toBoolean(exec); - JSC::JSValuePtr result = toJSNewlyCreated(exec, WTF::getPtr(imp->importNode(importedNode, deep, ec))); + JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->importNode(importedNode, deep, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDocumentPrototypeFunctionCreateElementNS(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateElementNS(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(exec, 0)); - const UString& qualifiedName = valueToStringWithNullCheck(exec, args.at(exec, 1)); + const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(0)); + const UString& qualifiedName = valueToStringWithNullCheck(exec, args.at(1)); - JSC::JSValuePtr result = toJSNewlyCreated(exec, WTF::getPtr(imp->createElementNS(namespaceURI, qualifiedName, ec))); + JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createElementNS(namespaceURI, qualifiedName, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDocumentPrototypeFunctionCreateAttributeNS(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateAttributeNS(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(exec, 0)); - const UString& qualifiedName = valueToStringWithNullCheck(exec, args.at(exec, 1)); + const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(0)); + const UString& qualifiedName = valueToStringWithNullCheck(exec, args.at(1)); - JSC::JSValuePtr result = toJSNewlyCreated(exec, WTF::getPtr(imp->createAttributeNS(namespaceURI, qualifiedName, ec))); + JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createAttributeNS(namespaceURI, qualifiedName, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDocumentPrototypeFunctionGetElementsByTagNameNS(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetElementsByTagNameNS(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(exec, 0)); - const UString& localName = args.at(exec, 1)->toString(exec); + const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(0)); + const UString& localName = args.at(1).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getElementsByTagNameNS(namespaceURI, localName))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getElementsByTagNameNS(namespaceURI, localName))); return result; } -JSValuePtr jsDocumentPrototypeFunctionGetElementById(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetElementById(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - const UString& elementId = args.at(exec, 0)->toString(exec); + const UString& elementId = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getElementById(elementId))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getElementById(elementId))); return result; } -JSValuePtr jsDocumentPrototypeFunctionAdoptNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionAdoptNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* source = toNode(args.at(exec, 0)); + Node* source = toNode(args.at(0)); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->adoptNode(source, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->adoptNode(source, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDocumentPrototypeFunctionCreateEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& eventType = args.at(exec, 0)->toString(exec); + const UString& eventType = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createEvent(eventType, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createEvent(eventType, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDocumentPrototypeFunctionCreateRange(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateRange(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createRange())); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createRange())); return result; } -JSValuePtr jsDocumentPrototypeFunctionCreateNodeIterator(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateNodeIterator(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* root = toNode(args.at(exec, 0)); - unsigned whatToShow = args.at(exec, 1)->toInt32(exec); - RefPtr<NodeFilter> filter = toNodeFilter(args.at(exec, 2)); - bool expandEntityReferences = args.at(exec, 3)->toBoolean(exec); + Node* root = toNode(args.at(0)); + unsigned whatToShow = args.at(1).toInt32(exec); + RefPtr<NodeFilter> filter = toNodeFilter(args.at(2)); + bool expandEntityReferences = args.at(3).toBoolean(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createNodeIterator(root, whatToShow, filter.get(), expandEntityReferences, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createNodeIterator(root, whatToShow, filter.get(), expandEntityReferences, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDocumentPrototypeFunctionCreateTreeWalker(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateTreeWalker(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* root = toNode(args.at(exec, 0)); - unsigned whatToShow = args.at(exec, 1)->toInt32(exec); - RefPtr<NodeFilter> filter = toNodeFilter(args.at(exec, 2)); - bool expandEntityReferences = args.at(exec, 3)->toBoolean(exec); + Node* root = toNode(args.at(0)); + unsigned whatToShow = args.at(1).toInt32(exec); + RefPtr<NodeFilter> filter = toNodeFilter(args.at(2)); + bool expandEntityReferences = args.at(3).toBoolean(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createTreeWalker(root, whatToShow, filter.get(), expandEntityReferences, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createTreeWalker(root, whatToShow, filter.get(), expandEntityReferences, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDocumentPrototypeFunctionGetOverrideStyle(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetOverrideStyle(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - Element* element = toElement(args.at(exec, 0)); - const UString& pseudoElement = args.at(exec, 1)->toString(exec); + Element* element = toElement(args.at(0)); + const UString& pseudoElement = args.at(1).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getOverrideStyle(element, pseudoElement))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getOverrideStyle(element, pseudoElement))); return result; } -JSValuePtr jsDocumentPrototypeFunctionCreateExpression(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateExpression(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& expression = args.at(exec, 0)->toString(exec); + const UString& expression = args.at(0).toString(exec); RefPtr<XPathNSResolver> customResolver; - XPathNSResolver* resolver = toXPathNSResolver(args.at(exec, 1)); + XPathNSResolver* resolver = toXPathNSResolver(args.at(1)); if (!resolver) { - customResolver = JSCustomXPathNSResolver::create(exec, args.at(exec, 1)); + customResolver = JSCustomXPathNSResolver::create(exec, args.at(1)); if (exec->hadException()) return jsUndefined(); resolver = customResolver.get(); } - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createExpression(expression, resolver, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createExpression(expression, resolver, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDocumentPrototypeFunctionCreateNSResolver(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateNSResolver(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - Node* nodeResolver = toNode(args.at(exec, 0)); + Node* nodeResolver = toNode(args.at(0)); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createNSResolver(nodeResolver))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createNSResolver(nodeResolver))); return result; } -JSValuePtr jsDocumentPrototypeFunctionEvaluate(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionEvaluate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& expression = args.at(exec, 0)->toString(exec); - Node* contextNode = toNode(args.at(exec, 1)); + const UString& expression = args.at(0).toString(exec); + Node* contextNode = toNode(args.at(1)); RefPtr<XPathNSResolver> customResolver; - XPathNSResolver* resolver = toXPathNSResolver(args.at(exec, 2)); + XPathNSResolver* resolver = toXPathNSResolver(args.at(2)); if (!resolver) { - customResolver = JSCustomXPathNSResolver::create(exec, args.at(exec, 2)); + customResolver = JSCustomXPathNSResolver::create(exec, args.at(2)); if (exec->hadException()) return jsUndefined(); resolver = customResolver.get(); } - unsigned short type = args.at(exec, 3)->toInt32(exec); - XPathResult* inResult = toXPathResult(args.at(exec, 4)); + unsigned short type = args.at(3).toInt32(exec); + XPathResult* inResult = toXPathResult(args.at(4)); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->evaluate(expression, contextNode, resolver, type, inResult, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->evaluate(expression, contextNode, resolver, type, inResult, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDocumentPrototypeFunctionExecCommand(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionExecCommand(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - const UString& command = args.at(exec, 0)->toString(exec); - bool userInterface = args.at(exec, 1)->toBoolean(exec); - const UString& value = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 2)); + const UString& command = args.at(0).toString(exec); + bool userInterface = args.at(1).toBoolean(exec); + const UString& value = valueToStringWithUndefinedOrNullCheck(exec, args.at(2)); - JSC::JSValuePtr result = jsBoolean(imp->execCommand(command, userInterface, value)); + JSC::JSValue result = jsBoolean(imp->execCommand(command, userInterface, value)); return result; } -JSValuePtr jsDocumentPrototypeFunctionQueryCommandEnabled(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionQueryCommandEnabled(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - const UString& command = args.at(exec, 0)->toString(exec); + const UString& command = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->queryCommandEnabled(command)); + JSC::JSValue result = jsBoolean(imp->queryCommandEnabled(command)); return result; } -JSValuePtr jsDocumentPrototypeFunctionQueryCommandIndeterm(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionQueryCommandIndeterm(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - const UString& command = args.at(exec, 0)->toString(exec); + const UString& command = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->queryCommandIndeterm(command)); + JSC::JSValue result = jsBoolean(imp->queryCommandIndeterm(command)); return result; } -JSValuePtr jsDocumentPrototypeFunctionQueryCommandState(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionQueryCommandState(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - const UString& command = args.at(exec, 0)->toString(exec); + const UString& command = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->queryCommandState(command)); + JSC::JSValue result = jsBoolean(imp->queryCommandState(command)); return result; } -JSValuePtr jsDocumentPrototypeFunctionQueryCommandSupported(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionQueryCommandSupported(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - const UString& command = args.at(exec, 0)->toString(exec); + const UString& command = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->queryCommandSupported(command)); + JSC::JSValue result = jsBoolean(imp->queryCommandSupported(command)); return result; } -JSValuePtr jsDocumentPrototypeFunctionQueryCommandValue(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionQueryCommandValue(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - const UString& command = args.at(exec, 0)->toString(exec); + const UString& command = args.at(0).toString(exec); - JSC::JSValuePtr result = jsStringOrFalse(exec, imp->queryCommandValue(command)); + JSC::JSValue result = jsStringOrFalse(exec, imp->queryCommandValue(command)); return result; } -JSValuePtr jsDocumentPrototypeFunctionGetElementsByName(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetElementsByName(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - const UString& elementName = args.at(exec, 0)->toString(exec); + const UString& elementName = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getElementsByName(elementName))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getElementsByName(elementName))); return result; } -JSValuePtr jsDocumentPrototypeFunctionElementFromPoint(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionElementFromPoint(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - int x = args.at(exec, 0)->toInt32(exec); - int y = args.at(exec, 1)->toInt32(exec); + int x = args.at(0).toInt32(exec); + int y = args.at(1).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->elementFromPoint(x, y))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->elementFromPoint(x, y))); return result; } -JSValuePtr jsDocumentPrototypeFunctionGetSelection(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetSelection(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getSelection())); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getSelection())); return result; } -JSValuePtr jsDocumentPrototypeFunctionGetCSSCanvasContext(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetCSSCanvasContext(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - const UString& contextId = args.at(exec, 0)->toString(exec); - const UString& name = args.at(exec, 1)->toString(exec); - int width = args.at(exec, 2)->toInt32(exec); - int height = args.at(exec, 3)->toInt32(exec); + const UString& contextId = args.at(0).toString(exec); + const UString& name = args.at(1).toString(exec); + int width = args.at(2).toInt32(exec); + int height = args.at(3).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getCSSCanvasContext(contextId, name, width, height))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getCSSCanvasContext(contextId, name, width, height))); return result; } -JSValuePtr jsDocumentPrototypeFunctionGetElementsByClassName(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetElementsByClassName(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); - const UString& tagname = args.at(exec, 0)->toString(exec); + const UString& tagname = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getElementsByClassName(tagname))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getElementsByClassName(tagname))); return result; } -JSValuePtr jsDocumentPrototypeFunctionQuerySelector(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionQuerySelector(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& selectors = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 0)); + const UString& selectors = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->querySelector(selectors, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->querySelector(selectors, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDocumentPrototypeFunctionQuerySelectorAll(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionQuerySelectorAll(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocument::s_info)) return throwError(exec, TypeError); JSDocument* castedThisObj = static_cast<JSDocument*>(asObject(thisValue)); Document* imp = static_cast<Document*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& selectors = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 0)); + const UString& selectors = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->querySelectorAll(selectors, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->querySelectorAll(selectors, ec))); setDOMException(exec, ec); return result; } -Document* toDocument(JSC::JSValuePtr value) +Document* toDocument(JSC::JSValue value) { - return value->isObject(&JSDocument::s_info) ? static_cast<JSDocument*>(asObject(value))->impl() : 0; + return value.isObject(&JSDocument::s_info) ? static_cast<JSDocument*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSDocument.h b/src/3rdparty/webkit/WebCore/generated/JSDocument.h index f3430b7d78..da6442f706 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDocument.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDocument.h @@ -21,7 +21,7 @@ #ifndef JSDocument_h #define JSDocument_h -#include "JSEventTargetNode.h" +#include "JSNode.h" #include <runtime/Lookup.h> #include <wtf/AlwaysInline.h> #include "Document.h" @@ -29,29 +29,29 @@ namespace WebCore { class Document; -class JSDocument : public JSEventTargetNode { - typedef JSEventTargetNode Base; +class JSDocument : public JSNode { + typedef JSNode Base; public: JSDocument(PassRefPtr<JSC::Structure>, PassRefPtr<Document>); virtual ~JSDocument(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void mark(); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom attributes - JSC::JSValuePtr location(JSC::ExecState*) const; - void setLocation(JSC::ExecState*, JSC::JSValuePtr); + JSC::JSValue location(JSC::ExecState*) const; + void setLocation(JSC::ExecState*, JSC::JSValue); Document* impl() const { return static_cast<Document*>(Base::impl()); @@ -63,16 +63,17 @@ ALWAYS_INLINE bool JSDocument::getOwnPropertySlot(JSC::ExecState* exec, const JS return JSC::getStaticValueSlot<JSDocument, Base>(exec, s_info.staticPropHashTable, this, propertyName, slot); } -JSC::JSValuePtr toJS(JSC::ExecState*, Document*); -Document* toDocument(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, Document*); +Document* toDocument(JSC::JSValue); class JSDocumentPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -81,84 +82,84 @@ public: // Functions -JSC::JSValuePtr jsDocumentPrototypeFunctionCreateElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionCreateDocumentFragment(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionCreateTextNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionCreateComment(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionCreateCDATASection(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionCreateProcessingInstruction(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionCreateAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionCreateEntityReference(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionGetElementsByTagName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionImportNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionCreateElementNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionCreateAttributeNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionGetElementsByTagNameNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionGetElementById(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionAdoptNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionCreateEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionCreateRange(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionCreateNodeIterator(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionCreateTreeWalker(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionGetOverrideStyle(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionCreateExpression(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionCreateNSResolver(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionEvaluate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionExecCommand(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionQueryCommandEnabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionQueryCommandIndeterm(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionQueryCommandState(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionQueryCommandSupported(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionQueryCommandValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionGetElementsByName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionElementFromPoint(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionGetSelection(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionGetCSSCanvasContext(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionGetElementsByClassName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionQuerySelector(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentPrototypeFunctionQuerySelectorAll(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateDocumentFragment(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateTextNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateComment(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateCDATASection(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateProcessingInstruction(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateEntityReference(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetElementsByTagName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionImportNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateElementNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateAttributeNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetElementsByTagNameNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetElementById(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionAdoptNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateRange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateNodeIterator(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateTreeWalker(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetOverrideStyle(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateExpression(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateNSResolver(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionEvaluate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionExecCommand(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionQueryCommandEnabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionQueryCommandIndeterm(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionQueryCommandState(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionQueryCommandSupported(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionQueryCommandValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetElementsByName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionElementFromPoint(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetSelection(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetCSSCanvasContext(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetElementsByClassName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionQuerySelector(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionQuerySelectorAll(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsDocumentDoctype(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentImplementation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentDocumentElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentInputEncoding(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentXMLEncoding(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentXMLVersion(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDocumentXMLVersion(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDocumentXMLStandalone(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDocumentXMLStandalone(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDocumentDocumentURI(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDocumentDocumentURI(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDocumentDefaultView(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentStyleSheets(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentTitle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDocumentTitle(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDocumentReferrer(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentDomain(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDocumentDomain(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDocumentURL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentCookie(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDocumentCookie(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDocumentBody(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDocumentBody(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDocumentImages(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentApplets(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentLinks(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentForms(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentAnchors(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentLastModified(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentLocation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDocumentLocation(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDocumentCharset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDocumentCharset(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDocumentDefaultCharset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentReadyState(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentCharacterSet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentPreferredStylesheetSet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentSelectedStylesheetSet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSDocumentSelectedStylesheetSet(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsDocumentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentDoctype(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentImplementation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentDocumentElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentInputEncoding(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentXMLEncoding(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentXMLVersion(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDocumentXMLVersion(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDocumentXMLStandalone(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDocumentXMLStandalone(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDocumentDocumentURI(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDocumentDocumentURI(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDocumentDefaultView(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentStyleSheets(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentTitle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDocumentTitle(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDocumentReferrer(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentDomain(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDocumentDomain(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDocumentURL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentCookie(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDocumentCookie(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDocumentBody(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDocumentBody(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDocumentImages(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentApplets(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentLinks(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentForms(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentAnchors(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentLastModified(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentLocation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDocumentLocation(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDocumentCharset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDocumentCharset(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDocumentDefaultCharset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentReadyState(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentCharacterSet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentPreferredStylesheetSet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentSelectedStylesheetSet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDocumentSelectedStylesheetSet(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDocumentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.cpp b/src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.cpp index 6912e4016b..f5e7a5dd2a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSDocumentFragment) +ASSERT_CLASS_FITS_IN_CELL(JSDocumentFragment); /* Hash table */ @@ -74,13 +74,13 @@ public: JSDocumentFragmentConstructor(ExecState* exec) : DOMObject(JSDocumentFragmentConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSDocumentFragmentPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSDocumentFragmentPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -111,9 +111,9 @@ static const HashTable JSDocumentFragmentPrototypeTable = const ClassInfo JSDocumentFragmentPrototype::s_info = { "DocumentFragmentPrototype", 0, &JSDocumentFragmentPrototypeTable, 0 }; -JSObject* JSDocumentFragmentPrototype::self(ExecState* exec) +JSObject* JSDocumentFragmentPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSDocumentFragment>(exec); + return getDOMPrototype<JSDocumentFragment>(exec, globalObject); } bool JSDocumentFragmentPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -121,16 +121,16 @@ bool JSDocumentFragmentPrototype::getOwnPropertySlot(ExecState* exec, const Iden return getStaticFunctionSlot<JSObject>(exec, &JSDocumentFragmentPrototypeTable, this, propertyName, slot); } -const ClassInfo JSDocumentFragment::s_info = { "DocumentFragment", &JSEventTargetNode::s_info, &JSDocumentFragmentTable, 0 }; +const ClassInfo JSDocumentFragment::s_info = { "DocumentFragment", &JSNode::s_info, &JSDocumentFragmentTable, 0 }; JSDocumentFragment::JSDocumentFragment(PassRefPtr<Structure> structure, PassRefPtr<DocumentFragment> impl) - : JSEventTargetNode(structure, impl) + : JSNode(structure, impl) { } -JSObject* JSDocumentFragment::createPrototype(ExecState* exec) +JSObject* JSDocumentFragment::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSDocumentFragmentPrototype(JSDocumentFragmentPrototype::createStructure(JSEventTargetNodePrototype::self(exec))); + return new (exec) JSDocumentFragmentPrototype(JSDocumentFragmentPrototype::createStructure(JSNodePrototype::self(exec, globalObject))); } bool JSDocumentFragment::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -138,41 +138,43 @@ bool JSDocumentFragment::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSDocumentFragment, Base>(exec, &JSDocumentFragmentTable, this, propertyName, slot); } -JSValuePtr jsDocumentFragmentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentFragmentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSDocumentFragment*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSDocumentFragment::getConstructor(ExecState* exec) +JSValue JSDocumentFragment::getConstructor(ExecState* exec) { return getDOMConstructor<JSDocumentFragmentConstructor>(exec); } -JSValuePtr jsDocumentFragmentPrototypeFunctionQuerySelector(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentFragmentPrototypeFunctionQuerySelector(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocumentFragment::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocumentFragment::s_info)) return throwError(exec, TypeError); JSDocumentFragment* castedThisObj = static_cast<JSDocumentFragment*>(asObject(thisValue)); DocumentFragment* imp = static_cast<DocumentFragment*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& selectors = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 0)); + const UString& selectors = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->querySelector(selectors, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->querySelector(selectors, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsDocumentFragmentPrototypeFunctionQuerySelectorAll(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsDocumentFragmentPrototypeFunctionQuerySelectorAll(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSDocumentFragment::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSDocumentFragment::s_info)) return throwError(exec, TypeError); JSDocumentFragment* castedThisObj = static_cast<JSDocumentFragment*>(asObject(thisValue)); DocumentFragment* imp = static_cast<DocumentFragment*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& selectors = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 0)); + const UString& selectors = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->querySelectorAll(selectors, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->querySelectorAll(selectors, ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.h b/src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.h index b157827d96..d5f57a3b8a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.h @@ -21,37 +21,38 @@ #ifndef JSDocumentFragment_h #define JSDocumentFragment_h -#include "JSEventTargetNode.h" +#include "JSNode.h" namespace WebCore { class DocumentFragment; -class JSDocumentFragment : public JSEventTargetNode { - typedef JSEventTargetNode Base; +class JSDocumentFragment : public JSNode { + typedef JSNode Base; public: JSDocumentFragment(PassRefPtr<JSC::Structure>, PassRefPtr<DocumentFragment>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSDocumentFragmentPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,11 +61,11 @@ public: // Functions -JSC::JSValuePtr jsDocumentFragmentPrototypeFunctionQuerySelector(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsDocumentFragmentPrototypeFunctionQuerySelectorAll(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentFragmentPrototypeFunctionQuerySelector(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsDocumentFragmentPrototypeFunctionQuerySelectorAll(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsDocumentFragmentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentFragmentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSDocumentType.cpp b/src/3rdparty/webkit/WebCore/generated/JSDocumentType.cpp index fb106b2f53..9777374aa5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDocumentType.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDocumentType.cpp @@ -27,7 +27,6 @@ #include "DocumentType.h" #include "JSNamedNodeMap.h" #include "KURL.h" -#include "NamedAttrMap.h" #include "NamedNodeMap.h" #include <runtime/JSNumberCell.h> @@ -37,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSDocumentType) +ASSERT_CLASS_FITS_IN_CELL(JSDocumentType); /* Hash table */ @@ -79,13 +78,13 @@ public: JSDocumentTypeConstructor(ExecState* exec) : DOMObject(JSDocumentTypeConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSDocumentTypePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSDocumentTypePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -114,9 +113,9 @@ static const HashTable JSDocumentTypePrototypeTable = const ClassInfo JSDocumentTypePrototype::s_info = { "DocumentTypePrototype", 0, &JSDocumentTypePrototypeTable, 0 }; -JSObject* JSDocumentTypePrototype::self(ExecState* exec) +JSObject* JSDocumentTypePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSDocumentType>(exec); + return getDOMPrototype<JSDocumentType>(exec, globalObject); } const ClassInfo JSDocumentType::s_info = { "DocumentType", &JSNode::s_info, &JSDocumentTypeTable, 0 }; @@ -126,9 +125,9 @@ JSDocumentType::JSDocumentType(PassRefPtr<Structure> structure, PassRefPtr<Docum { } -JSObject* JSDocumentType::createPrototype(ExecState* exec) +JSObject* JSDocumentType::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSDocumentTypePrototype(JSDocumentTypePrototype::createStructure(JSNodePrototype::self(exec))); + return new (exec) JSDocumentTypePrototype(JSDocumentTypePrototype::createStructure(JSNodePrototype::self(exec, globalObject))); } bool JSDocumentType::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -136,54 +135,60 @@ bool JSDocumentType::getOwnPropertySlot(ExecState* exec, const Identifier& prope return getStaticValueSlot<JSDocumentType, Base>(exec, &JSDocumentTypeTable, this, propertyName, slot); } -JSValuePtr jsDocumentTypeName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentTypeName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DocumentType* imp = static_cast<DocumentType*>(static_cast<JSDocumentType*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsDocumentTypeEntities(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentTypeEntities(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DocumentType* imp = static_cast<DocumentType*>(static_cast<JSDocumentType*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->entities())); } -JSValuePtr jsDocumentTypeNotations(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentTypeNotations(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DocumentType* imp = static_cast<DocumentType*>(static_cast<JSDocumentType*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->notations())); } -JSValuePtr jsDocumentTypePublicId(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentTypePublicId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DocumentType* imp = static_cast<DocumentType*>(static_cast<JSDocumentType*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->publicId()); } -JSValuePtr jsDocumentTypeSystemId(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentTypeSystemId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DocumentType* imp = static_cast<DocumentType*>(static_cast<JSDocumentType*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->systemId()); } -JSValuePtr jsDocumentTypeInternalSubset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentTypeInternalSubset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); DocumentType* imp = static_cast<DocumentType*>(static_cast<JSDocumentType*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->internalSubset()); } -JSValuePtr jsDocumentTypeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsDocumentTypeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSDocumentType*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSDocumentType::getConstructor(ExecState* exec) +JSValue JSDocumentType::getConstructor(ExecState* exec) { return getDOMConstructor<JSDocumentTypeConstructor>(exec); } -DocumentType* toDocumentType(JSC::JSValuePtr value) +DocumentType* toDocumentType(JSC::JSValue value) { - return value->isObject(&JSDocumentType::s_info) ? static_cast<JSDocumentType*>(asObject(value))->impl() : 0; + return value.isObject(&JSDocumentType::s_info) ? static_cast<JSDocumentType*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSDocumentType.h b/src/3rdparty/webkit/WebCore/generated/JSDocumentType.h index 56f3c7be2e..1fb4e3e11c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDocumentType.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDocumentType.h @@ -31,28 +31,29 @@ class JSDocumentType : public JSNode { typedef JSNode Base; public: JSDocumentType(PassRefPtr<JSC::Structure>, PassRefPtr<DocumentType>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); DocumentType* impl() const { return static_cast<DocumentType*>(Base::impl()); } }; -DocumentType* toDocumentType(JSC::JSValuePtr); +DocumentType* toDocumentType(JSC::JSValue); class JSDocumentTypePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSDocumentTypePrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -60,13 +61,13 @@ public: // Attributes -JSC::JSValuePtr jsDocumentTypeName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentTypeEntities(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentTypeNotations(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentTypePublicId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentTypeSystemId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentTypeInternalSubset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsDocumentTypeConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentTypeName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentTypeEntities(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentTypeNotations(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentTypePublicId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentTypeSystemId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentTypeInternalSubset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsDocumentTypeConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSElement.cpp index 8ecc6798a2..1bddbba46a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSElement.cpp @@ -27,9 +27,13 @@ #include "Attr.h" #include "CSSMutableStyleDeclaration.h" #include "CSSStyleDeclaration.h" +#include "ClientRect.h" +#include "ClientRectList.h" #include "Element.h" #include "JSAttr.h" #include "JSCSSStyleDeclaration.h" +#include "JSClientRect.h" +#include "JSClientRectList.h" #include "JSElement.h" #include "JSNodeList.h" #include "KURL.h" @@ -44,7 +48,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSElement) +ASSERT_CLASS_FITS_IN_CELL(JSElement); /* Hash table */ @@ -100,13 +104,13 @@ public: JSElementConstructor(ExecState* exec) : DOMObject(JSElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -121,7 +125,7 @@ bool JSElementConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& /* Hash table for prototype */ -static const HashTableValue JSElementPrototypeTableValues[26] = +static const HashTableValue JSElementPrototypeTableValues[28] = { { "getAttribute", DontDelete|Function, (intptr_t)jsElementPrototypeFunctionGetAttribute, (intptr_t)1 }, { "setAttribute", DontDelete|Function, (intptr_t)jsElementPrototypeFunctionSetAttribute, (intptr_t)2 }, @@ -148,6 +152,8 @@ static const HashTableValue JSElementPrototypeTableValues[26] = { "getElementsByClassName", DontDelete|Function, (intptr_t)jsElementPrototypeFunctionGetElementsByClassName, (intptr_t)1 }, { "querySelector", DontDelete|Function, (intptr_t)jsElementPrototypeFunctionQuerySelector, (intptr_t)1 }, { "querySelectorAll", DontDelete|Function, (intptr_t)jsElementPrototypeFunctionQuerySelectorAll, (intptr_t)1 }, + { "getClientRects", DontDelete|Function, (intptr_t)jsElementPrototypeFunctionGetClientRects, (intptr_t)0 }, + { "getBoundingClientRect", DontDelete|Function, (intptr_t)jsElementPrototypeFunctionGetBoundingClientRect, (intptr_t)0 }, { 0, 0, 0, 0 } }; @@ -155,14 +161,14 @@ static const HashTable JSElementPrototypeTable = #if ENABLE(PERFECT_HASH_SIZE) { 1023, JSElementPrototypeTableValues, 0 }; #else - { 68, 63, JSElementPrototypeTableValues, 0 }; + { 69, 63, JSElementPrototypeTableValues, 0 }; #endif const ClassInfo JSElementPrototype::s_info = { "ElementPrototype", 0, &JSElementPrototypeTable, 0 }; -JSObject* JSElementPrototype::self(ExecState* exec) +JSObject* JSElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSElement>(exec); + return getDOMPrototype<JSElement>(exec, globalObject); } bool JSElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -170,351 +176,387 @@ bool JSElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticFunctionSlot<JSObject>(exec, &JSElementPrototypeTable, this, propertyName, slot); } -const ClassInfo JSElement::s_info = { "Element", &JSEventTargetNode::s_info, &JSElementTable, 0 }; +const ClassInfo JSElement::s_info = { "Element", &JSNode::s_info, &JSElementTable, 0 }; JSElement::JSElement(PassRefPtr<Structure> structure, PassRefPtr<Element> impl) - : JSEventTargetNode(structure, impl) + : JSNode(structure, impl) { } -JSObject* JSElement::createPrototype(ExecState* exec) +JSObject* JSElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSElementPrototype(JSElementPrototype::createStructure(JSEventTargetNodePrototype::self(exec))); + return new (exec) JSElementPrototype(JSElementPrototype::createStructure(JSNodePrototype::self(exec, globalObject))); } -JSValuePtr jsElementTagName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementTagName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->tagName()); } -JSValuePtr jsElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsElementOffsetLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementOffsetLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->offsetLeft()); } -JSValuePtr jsElementOffsetTop(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementOffsetTop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->offsetTop()); } -JSValuePtr jsElementOffsetWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementOffsetWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->offsetWidth()); } -JSValuePtr jsElementOffsetHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementOffsetHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->offsetHeight()); } -JSValuePtr jsElementOffsetParent(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementOffsetParent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->offsetParent())); } -JSValuePtr jsElementClientLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementClientLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->clientLeft()); } -JSValuePtr jsElementClientTop(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementClientTop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->clientTop()); } -JSValuePtr jsElementClientWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementClientWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->clientWidth()); } -JSValuePtr jsElementClientHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementClientHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->clientHeight()); } -JSValuePtr jsElementScrollLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementScrollLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->scrollLeft()); } -JSValuePtr jsElementScrollTop(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementScrollTop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->scrollTop()); } -JSValuePtr jsElementScrollWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementScrollWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->scrollWidth()); } -JSValuePtr jsElementScrollHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementScrollHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->scrollHeight()); } -JSValuePtr jsElementFirstElementChild(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementFirstElementChild(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->firstElementChild())); } -JSValuePtr jsElementLastElementChild(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementLastElementChild(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->lastElementChild())); } -JSValuePtr jsElementPreviousElementSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementPreviousElementSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->previousElementSibling())); } -JSValuePtr jsElementNextElementSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementNextElementSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nextElementSibling())); } -JSValuePtr jsElementChildElementCount(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementChildElementCount(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Element* imp = static_cast<Element*>(static_cast<JSElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->childElementCount()); } -JSValuePtr jsElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSElement, Base>(exec, propertyName, value, &JSElementTable, this, slot); } -void setJSElementScrollLeft(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSElementScrollLeft(ExecState* exec, JSObject* thisObject, JSValue value) { Element* imp = static_cast<Element*>(static_cast<JSElement*>(thisObject)->impl()); - imp->setScrollLeft(value->toInt32(exec)); + imp->setScrollLeft(value.toInt32(exec)); } -void setJSElementScrollTop(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSElementScrollTop(ExecState* exec, JSObject* thisObject, JSValue value) { Element* imp = static_cast<Element*>(static_cast<JSElement*>(thisObject)->impl()); - imp->setScrollTop(value->toInt32(exec)); + imp->setScrollTop(value.toInt32(exec)); } -JSValuePtr JSElement::getConstructor(ExecState* exec) +JSValue JSElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSElementConstructor>(exec); } -JSValuePtr jsElementPrototypeFunctionGetAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = jsStringOrNull(exec, imp->getAttribute(name)); + JSC::JSValue result = jsStringOrNull(exec, imp->getAttribute(name)); return result; } -JSValuePtr jsElementPrototypeFunctionSetAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionSetAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); return castedThisObj->setAttribute(exec, args); } -JSValuePtr jsElementPrototypeFunctionRemoveAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionRemoveAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); imp->removeAttribute(name, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsElementPrototypeFunctionGetAttributeNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetAttributeNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getAttributeNode(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getAttributeNode(name))); return result; } -JSValuePtr jsElementPrototypeFunctionSetAttributeNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionSetAttributeNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); return castedThisObj->setAttributeNode(exec, args); } -JSValuePtr jsElementPrototypeFunctionRemoveAttributeNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionRemoveAttributeNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); ExceptionCode ec = 0; - Attr* oldAttr = toAttr(args.at(exec, 0)); + Attr* oldAttr = toAttr(args.at(0)); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->removeAttributeNode(oldAttr, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->removeAttributeNode(oldAttr, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsElementPrototypeFunctionGetElementsByTagName(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetElementsByTagName(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getElementsByTagName(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getElementsByTagName(name))); return result; } -JSValuePtr jsElementPrototypeFunctionGetAttributeNS(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetAttributeNS(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); - const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(exec, 0)); - const UString& localName = args.at(exec, 1)->toString(exec); + const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(0)); + const UString& localName = args.at(1).toString(exec); - JSC::JSValuePtr result = jsString(exec, imp->getAttributeNS(namespaceURI, localName)); + JSC::JSValue result = jsString(exec, imp->getAttributeNS(namespaceURI, localName)); return result; } -JSValuePtr jsElementPrototypeFunctionSetAttributeNS(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionSetAttributeNS(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); return castedThisObj->setAttributeNS(exec, args); } -JSValuePtr jsElementPrototypeFunctionRemoveAttributeNS(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionRemoveAttributeNS(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(exec, 0)); - const UString& localName = args.at(exec, 1)->toString(exec); + const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(0)); + const UString& localName = args.at(1).toString(exec); imp->removeAttributeNS(namespaceURI, localName, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsElementPrototypeFunctionGetElementsByTagNameNS(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetElementsByTagNameNS(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); - const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(exec, 0)); - const UString& localName = args.at(exec, 1)->toString(exec); + const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(0)); + const UString& localName = args.at(1).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getElementsByTagNameNS(namespaceURI, localName))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getElementsByTagNameNS(namespaceURI, localName))); return result; } -JSValuePtr jsElementPrototypeFunctionGetAttributeNodeNS(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetAttributeNodeNS(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); - const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(exec, 0)); - const UString& localName = args.at(exec, 1)->toString(exec); + const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(0)); + const UString& localName = args.at(1).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getAttributeNodeNS(namespaceURI, localName))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getAttributeNodeNS(namespaceURI, localName))); return result; } -JSValuePtr jsElementPrototypeFunctionSetAttributeNodeNS(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionSetAttributeNodeNS(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); return castedThisObj->setAttributeNodeNS(exec, args); } -JSValuePtr jsElementPrototypeFunctionHasAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionHasAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasAttribute(name)); + JSC::JSValue result = jsBoolean(imp->hasAttribute(name)); return result; } -JSValuePtr jsElementPrototypeFunctionHasAttributeNS(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionHasAttributeNS(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); - const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(exec, 0)); - const UString& localName = args.at(exec, 1)->toString(exec); + const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(0)); + const UString& localName = args.at(1).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasAttributeNS(namespaceURI, localName)); + JSC::JSValue result = jsBoolean(imp->hasAttributeNS(namespaceURI, localName)); return result; } -JSValuePtr jsElementPrototypeFunctionFocus(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionFocus(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); @@ -523,9 +565,10 @@ JSValuePtr jsElementPrototypeFunctionFocus(ExecState* exec, JSObject*, JSValuePt return jsUndefined(); } -JSValuePtr jsElementPrototypeFunctionBlur(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionBlur(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); @@ -534,9 +577,10 @@ JSValuePtr jsElementPrototypeFunctionBlur(ExecState* exec, JSObject*, JSValuePtr return jsUndefined(); } -JSValuePtr jsElementPrototypeFunctionScrollIntoView(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionScrollIntoView(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); @@ -547,28 +591,30 @@ JSValuePtr jsElementPrototypeFunctionScrollIntoView(ExecState* exec, JSObject*, return jsUndefined(); } - bool alignWithTop = args.at(exec, 0)->toBoolean(exec); + bool alignWithTop = args.at(0).toBoolean(exec); imp->scrollIntoView(alignWithTop); return jsUndefined(); } -JSValuePtr jsElementPrototypeFunctionContains(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionContains(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); - Element* element = toElement(args.at(exec, 0)); + Element* element = toElement(args.at(0)); - JSC::JSValuePtr result = jsBoolean(imp->contains(element)); + JSC::JSValue result = jsBoolean(imp->contains(element)); return result; } -JSValuePtr jsElementPrototypeFunctionScrollIntoViewIfNeeded(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionScrollIntoViewIfNeeded(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); @@ -579,82 +625,113 @@ JSValuePtr jsElementPrototypeFunctionScrollIntoViewIfNeeded(ExecState* exec, JSO return jsUndefined(); } - bool centerIfNeeded = args.at(exec, 0)->toBoolean(exec); + bool centerIfNeeded = args.at(0).toBoolean(exec); imp->scrollIntoViewIfNeeded(centerIfNeeded); return jsUndefined(); } -JSValuePtr jsElementPrototypeFunctionScrollByLines(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionScrollByLines(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); - int lines = args.at(exec, 0)->toInt32(exec); + int lines = args.at(0).toInt32(exec); imp->scrollByLines(lines); return jsUndefined(); } -JSValuePtr jsElementPrototypeFunctionScrollByPages(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionScrollByPages(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); - int pages = args.at(exec, 0)->toInt32(exec); + int pages = args.at(0).toInt32(exec); imp->scrollByPages(pages); return jsUndefined(); } -JSValuePtr jsElementPrototypeFunctionGetElementsByClassName(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetElementsByClassName(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getElementsByClassName(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getElementsByClassName(name))); return result; } -JSValuePtr jsElementPrototypeFunctionQuerySelector(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionQuerySelector(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& selectors = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 0)); + const UString& selectors = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->querySelector(selectors, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->querySelector(selectors, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsElementPrototypeFunctionQuerySelectorAll(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionQuerySelectorAll(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) return throwError(exec, TypeError); JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); Element* imp = static_cast<Element*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& selectors = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 0)); + const UString& selectors = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->querySelectorAll(selectors, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->querySelectorAll(selectors, ec))); setDOMException(exec, ec); return result; } -Element* toElement(JSC::JSValuePtr value) +JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetClientRects(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - return value->isObject(&JSElement::s_info) ? static_cast<JSElement*>(asObject(value))->impl() : 0; + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) + return throwError(exec, TypeError); + JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); + Element* imp = static_cast<Element*>(castedThisObj->impl()); + + + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getClientRects())); + return result; +} + +JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetBoundingClientRect(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSElement::s_info)) + return throwError(exec, TypeError); + JSElement* castedThisObj = static_cast<JSElement*>(asObject(thisValue)); + Element* imp = static_cast<Element*>(castedThisObj->impl()); + + + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getBoundingClientRect())); + return result; +} + +Element* toElement(JSC::JSValue value) +{ + return value.isObject(&JSElement::s_info) ? static_cast<JSElement*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSElement.h b/src/3rdparty/webkit/WebCore/generated/JSElement.h index 391f757306..aecee1dba2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSElement.h @@ -21,7 +21,7 @@ #ifndef JSElement_h #define JSElement_h -#include "JSEventTargetNode.h" +#include "JSNode.h" #include <runtime/Lookup.h> #include <wtf/AlwaysInline.h> #include "Element.h" @@ -29,28 +29,28 @@ namespace WebCore { class Element; -class JSElement : public JSEventTargetNode { - typedef JSEventTargetNode Base; +class JSElement : public JSNode { + typedef JSNode Base; public: JSElement(PassRefPtr<JSC::Structure>, PassRefPtr<Element>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom functions - JSC::JSValuePtr setAttribute(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr setAttributeNode(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr setAttributeNS(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr setAttributeNodeNS(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setAttribute(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setAttributeNode(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setAttributeNS(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setAttributeNodeNS(JSC::ExecState*, const JSC::ArgList&); Element* impl() const { return static_cast<Element*>(Base::impl()); @@ -62,16 +62,17 @@ ALWAYS_INLINE bool JSElement::getOwnPropertySlot(JSC::ExecState* exec, const JSC return JSC::getStaticValueSlot<JSElement, Base>(exec, s_info.staticPropHashTable, this, propertyName, slot); } -Element* toElement(JSC::JSValuePtr); -JSC::JSValuePtr toJSNewlyCreated(JSC::ExecState*, Element*); +Element* toElement(JSC::JSValue); +JSC::JSValue toJSNewlyCreated(JSC::ExecState*, Element*); class JSElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -80,56 +81,58 @@ public: // Functions -JSC::JSValuePtr jsElementPrototypeFunctionGetAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionSetAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionRemoveAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionGetAttributeNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionSetAttributeNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionRemoveAttributeNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionGetElementsByTagName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionGetAttributeNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionSetAttributeNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionRemoveAttributeNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionGetElementsByTagNameNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionGetAttributeNodeNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionSetAttributeNodeNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionHasAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionHasAttributeNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionFocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionBlur(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionScrollIntoView(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionContains(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionScrollIntoViewIfNeeded(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionScrollByLines(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionScrollByPages(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionGetElementsByClassName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionQuerySelector(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsElementPrototypeFunctionQuerySelectorAll(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionSetAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionRemoveAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetAttributeNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionSetAttributeNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionRemoveAttributeNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetElementsByTagName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetAttributeNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionSetAttributeNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionRemoveAttributeNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetElementsByTagNameNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetAttributeNodeNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionSetAttributeNodeNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionHasAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionHasAttributeNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionFocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionBlur(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionScrollIntoView(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionContains(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionScrollIntoViewIfNeeded(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionScrollByLines(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionScrollByPages(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetElementsByClassName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionQuerySelector(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionQuerySelectorAll(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetClientRects(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetBoundingClientRect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsElementTagName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementOffsetLeft(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementOffsetTop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementOffsetWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementOffsetHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementOffsetParent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementClientLeft(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementClientTop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementClientWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementClientHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementScrollLeft(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSElementScrollLeft(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsElementScrollTop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSElementScrollTop(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsElementScrollWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementScrollHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementFirstElementChild(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementLastElementChild(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementPreviousElementSibling(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementNextElementSibling(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementChildElementCount(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementTagName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementOffsetLeft(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementOffsetTop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementOffsetWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementOffsetHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementOffsetParent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementClientLeft(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementClientTop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementClientWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementClientHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementScrollLeft(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSElementScrollLeft(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsElementScrollTop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSElementScrollTop(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsElementScrollWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementScrollHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementFirstElementChild(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementLastElementChild(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementPreviousElementSibling(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementNextElementSibling(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementChildElementCount(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSEntity.cpp b/src/3rdparty/webkit/WebCore/generated/JSEntity.cpp index 464a93ff71..c9f355a56e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEntity.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSEntity.cpp @@ -33,7 +33,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSEntity) +ASSERT_CLASS_FITS_IN_CELL(JSEntity); /* Hash table */ @@ -72,13 +72,13 @@ public: JSEntityConstructor(ExecState* exec) : DOMObject(JSEntityConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSEntityPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSEntityPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -107,9 +107,9 @@ static const HashTable JSEntityPrototypeTable = const ClassInfo JSEntityPrototype::s_info = { "EntityPrototype", 0, &JSEntityPrototypeTable, 0 }; -JSObject* JSEntityPrototype::self(ExecState* exec) +JSObject* JSEntityPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSEntity>(exec); + return getDOMPrototype<JSEntity>(exec, globalObject); } const ClassInfo JSEntity::s_info = { "Entity", &JSNode::s_info, &JSEntityTable, 0 }; @@ -119,9 +119,9 @@ JSEntity::JSEntity(PassRefPtr<Structure> structure, PassRefPtr<Entity> impl) { } -JSObject* JSEntity::createPrototype(ExecState* exec) +JSObject* JSEntity::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSEntityPrototype(JSEntityPrototype::createStructure(JSNodePrototype::self(exec))); + return new (exec) JSEntityPrototype(JSEntityPrototype::createStructure(JSNodePrototype::self(exec, globalObject))); } bool JSEntity::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -129,29 +129,32 @@ bool JSEntity::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNam return getStaticValueSlot<JSEntity, Base>(exec, &JSEntityTable, this, propertyName, slot); } -JSValuePtr jsEntityPublicId(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEntityPublicId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Entity* imp = static_cast<Entity*>(static_cast<JSEntity*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->publicId()); } -JSValuePtr jsEntitySystemId(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEntitySystemId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Entity* imp = static_cast<Entity*>(static_cast<JSEntity*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->systemId()); } -JSValuePtr jsEntityNotationName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEntityNotationName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Entity* imp = static_cast<Entity*>(static_cast<JSEntity*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->notationName()); } -JSValuePtr jsEntityConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEntityConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSEntity*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSEntity::getConstructor(ExecState* exec) +JSValue JSEntity::getConstructor(ExecState* exec) { return getDOMConstructor<JSEntityConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSEntity.h b/src/3rdparty/webkit/WebCore/generated/JSEntity.h index 890204f0d4..b54cf58226 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEntity.h +++ b/src/3rdparty/webkit/WebCore/generated/JSEntity.h @@ -31,23 +31,24 @@ class JSEntity : public JSNode { typedef JSNode Base; public: JSEntity(PassRefPtr<JSC::Structure>, PassRefPtr<Entity>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSEntityPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSEntityPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -55,10 +56,10 @@ public: // Attributes -JSC::JSValuePtr jsEntityPublicId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEntitySystemId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEntityNotationName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEntityConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEntityPublicId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEntitySystemId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEntityNotationName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEntityConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSEntityReference.cpp b/src/3rdparty/webkit/WebCore/generated/JSEntityReference.cpp index 19effcaaa8..88450e75af 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEntityReference.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSEntityReference.cpp @@ -32,7 +32,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSEntityReference) +ASSERT_CLASS_FITS_IN_CELL(JSEntityReference); /* Hash table */ @@ -68,13 +68,13 @@ public: JSEntityReferenceConstructor(ExecState* exec) : DOMObject(JSEntityReferenceConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSEntityReferencePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSEntityReferencePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -103,9 +103,9 @@ static const HashTable JSEntityReferencePrototypeTable = const ClassInfo JSEntityReferencePrototype::s_info = { "EntityReferencePrototype", 0, &JSEntityReferencePrototypeTable, 0 }; -JSObject* JSEntityReferencePrototype::self(ExecState* exec) +JSObject* JSEntityReferencePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSEntityReference>(exec); + return getDOMPrototype<JSEntityReference>(exec, globalObject); } const ClassInfo JSEntityReference::s_info = { "EntityReference", &JSNode::s_info, &JSEntityReferenceTable, 0 }; @@ -115,9 +115,9 @@ JSEntityReference::JSEntityReference(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSEntityReference::createPrototype(ExecState* exec) +JSObject* JSEntityReference::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSEntityReferencePrototype(JSEntityReferencePrototype::createStructure(JSNodePrototype::self(exec))); + return new (exec) JSEntityReferencePrototype(JSEntityReferencePrototype::createStructure(JSNodePrototype::self(exec, globalObject))); } bool JSEntityReference::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -125,11 +125,11 @@ bool JSEntityReference::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSEntityReference, Base>(exec, &JSEntityReferenceTable, this, propertyName, slot); } -JSValuePtr jsEntityReferenceConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEntityReferenceConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSEntityReference*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSEntityReference::getConstructor(ExecState* exec) +JSValue JSEntityReference::getConstructor(ExecState* exec) { return getDOMConstructor<JSEntityReferenceConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSEntityReference.h b/src/3rdparty/webkit/WebCore/generated/JSEntityReference.h index 8a93de79a5..0c0957a7a2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEntityReference.h +++ b/src/3rdparty/webkit/WebCore/generated/JSEntityReference.h @@ -31,23 +31,24 @@ class JSEntityReference : public JSNode { typedef JSNode Base; public: JSEntityReference(PassRefPtr<JSC::Structure>, PassRefPtr<EntityReference>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSEntityReferencePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSEntityReferencePrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -55,7 +56,7 @@ public: // Attributes -JSC::JSValuePtr jsEntityReferenceConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEntityReferenceConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSEvent.cpp index cf2ee30757..fa1feac5c2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSEvent.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSEvent) +ASSERT_CLASS_FITS_IN_CELL(JSEvent); /* Hash table */ @@ -103,13 +103,13 @@ public: JSEventConstructor(ExecState* exec) : DOMObject(JSEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSEventPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSEventPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -164,9 +164,9 @@ static const HashTable* getJSEventPrototypeTable(ExecState* exec) } const ClassInfo JSEventPrototype::s_info = { "EventPrototype", 0, 0, getJSEventPrototypeTable }; -JSObject* JSEventPrototype::self(ExecState* exec) +JSObject* JSEventPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSEvent>(exec); + return getDOMPrototype<JSEvent>(exec, globalObject); } bool JSEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -189,12 +189,11 @@ JSEvent::JSEvent(PassRefPtr<Structure> structure, PassRefPtr<Event> impl) JSEvent::~JSEvent() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSEvent::createPrototype(ExecState* exec) +JSObject* JSEvent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSEventPrototype(JSEventPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSEventPrototype(JSEventPrototype::createStructure(globalObject->objectPrototype())); } bool JSEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -202,100 +201,111 @@ bool JSEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName return getStaticValueSlot<JSEvent, Base>(exec, getJSEventTable(exec), this, propertyName, slot); } -JSValuePtr jsEventType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEventType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Event* imp = static_cast<Event*>(static_cast<JSEvent*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsEventTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEventTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Event* imp = static_cast<Event*>(static_cast<JSEvent*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->target())); } -JSValuePtr jsEventCurrentTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEventCurrentTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Event* imp = static_cast<Event*>(static_cast<JSEvent*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->currentTarget())); } -JSValuePtr jsEventEventPhase(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEventEventPhase(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Event* imp = static_cast<Event*>(static_cast<JSEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->eventPhase()); } -JSValuePtr jsEventBubbles(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEventBubbles(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Event* imp = static_cast<Event*>(static_cast<JSEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->bubbles()); } -JSValuePtr jsEventCancelable(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEventCancelable(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Event* imp = static_cast<Event*>(static_cast<JSEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->cancelable()); } -JSValuePtr jsEventTimeStamp(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEventTimeStamp(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Event* imp = static_cast<Event*>(static_cast<JSEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->timeStamp()); } -JSValuePtr jsEventSrcElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEventSrcElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Event* imp = static_cast<Event*>(static_cast<JSEvent*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->srcElement())); } -JSValuePtr jsEventReturnValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEventReturnValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Event* imp = static_cast<Event*>(static_cast<JSEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->returnValue()); } -JSValuePtr jsEventCancelBubble(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEventCancelBubble(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Event* imp = static_cast<Event*>(static_cast<JSEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->cancelBubble()); } -JSValuePtr jsEventClipboardData(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEventClipboardData(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSEvent*>(asObject(slot.slotBase()))->clipboardData(exec); } -JSValuePtr jsEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSEvent*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSEvent::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSEvent::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSEvent, Base>(exec, propertyName, value, getJSEventTable(exec), this, slot); } -void setJSEventReturnValue(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSEventReturnValue(ExecState* exec, JSObject* thisObject, JSValue value) { Event* imp = static_cast<Event*>(static_cast<JSEvent*>(thisObject)->impl()); - imp->setReturnValue(value->toBoolean(exec)); + imp->setReturnValue(value.toBoolean(exec)); } -void setJSEventCancelBubble(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSEventCancelBubble(ExecState* exec, JSObject* thisObject, JSValue value) { Event* imp = static_cast<Event*>(static_cast<JSEvent*>(thisObject)->impl()); - imp->setCancelBubble(value->toBoolean(exec)); + imp->setCancelBubble(value.toBoolean(exec)); } -JSValuePtr JSEvent::getConstructor(ExecState* exec) +JSValue JSEvent::getConstructor(ExecState* exec) { return getDOMConstructor<JSEventConstructor>(exec); } -JSValuePtr jsEventPrototypeFunctionStopPropagation(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsEventPrototypeFunctionStopPropagation(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSEvent::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSEvent::s_info)) return throwError(exec, TypeError); JSEvent* castedThisObj = static_cast<JSEvent*>(asObject(thisValue)); Event* imp = static_cast<Event*>(castedThisObj->impl()); @@ -304,9 +314,10 @@ JSValuePtr jsEventPrototypeFunctionStopPropagation(ExecState* exec, JSObject*, J return jsUndefined(); } -JSValuePtr jsEventPrototypeFunctionPreventDefault(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsEventPrototypeFunctionPreventDefault(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSEvent::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSEvent::s_info)) return throwError(exec, TypeError); JSEvent* castedThisObj = static_cast<JSEvent*>(asObject(thisValue)); Event* imp = static_cast<Event*>(castedThisObj->impl()); @@ -315,15 +326,16 @@ JSValuePtr jsEventPrototypeFunctionPreventDefault(ExecState* exec, JSObject*, JS return jsUndefined(); } -JSValuePtr jsEventPrototypeFunctionInitEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsEventPrototypeFunctionInitEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSEvent::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSEvent::s_info)) return throwError(exec, TypeError); JSEvent* castedThisObj = static_cast<JSEvent*>(asObject(thisValue)); Event* imp = static_cast<Event*>(castedThisObj->impl()); - const UString& eventTypeArg = args.at(exec, 0)->toString(exec); - bool canBubbleArg = args.at(exec, 1)->toBoolean(exec); - bool cancelableArg = args.at(exec, 2)->toBoolean(exec); + const UString& eventTypeArg = args.at(0).toString(exec); + bool canBubbleArg = args.at(1).toBoolean(exec); + bool cancelableArg = args.at(2).toBoolean(exec); imp->initEvent(eventTypeArg, canBubbleArg, cancelableArg); return jsUndefined(); @@ -331,104 +343,104 @@ JSValuePtr jsEventPrototypeFunctionInitEvent(ExecState* exec, JSObject*, JSValue // Constant getters -JSValuePtr jsEventCAPTURING_PHASE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventCAPTURING_PHASE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsEventAT_TARGET(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventAT_TARGET(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsEventBUBBLING_PHASE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventBUBBLING_PHASE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsEventMOUSEDOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventMOUSEDOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsEventMOUSEUP(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventMOUSEUP(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsEventMOUSEOVER(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventMOUSEOVER(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSValuePtr jsEventMOUSEOUT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventMOUSEOUT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(8)); } -JSValuePtr jsEventMOUSEMOVE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventMOUSEMOVE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(16)); } -JSValuePtr jsEventMOUSEDRAG(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventMOUSEDRAG(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(32)); } -JSValuePtr jsEventCLICK(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventCLICK(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(64)); } -JSValuePtr jsEventDBLCLICK(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventDBLCLICK(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(128)); } -JSValuePtr jsEventKEYDOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventKEYDOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(256)); } -JSValuePtr jsEventKEYUP(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventKEYUP(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(512)); } -JSValuePtr jsEventKEYPRESS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventKEYPRESS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1024)); } -JSValuePtr jsEventDRAGDROP(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventDRAGDROP(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2048)); } -JSValuePtr jsEventFOCUS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventFOCUS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4096)); } -JSValuePtr jsEventBLUR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventBLUR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(8192)); } -JSValuePtr jsEventSELECT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventSELECT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(16384)); } -JSValuePtr jsEventCHANGE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventCHANGE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(32768)); } -Event* toEvent(JSC::JSValuePtr value) +Event* toEvent(JSC::JSValue value) { - return value->isObject(&JSEvent::s_info) ? static_cast<JSEvent*>(asObject(value))->impl() : 0; + return value.isObject(&JSEvent::s_info) ? static_cast<JSEvent*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSEvent.h b/src/3rdparty/webkit/WebCore/generated/JSEvent.h index 22a33f7da1..281010bee3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSEvent.h @@ -34,37 +34,38 @@ class JSEvent : public DOMObject { public: JSEvent(PassRefPtr<JSC::Structure>, PassRefPtr<Event>); virtual ~JSEvent(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom attributes - JSC::JSValuePtr clipboardData(JSC::ExecState*) const; + JSC::JSValue clipboardData(JSC::ExecState*) const; Event* impl() const { return m_impl.get(); } private: RefPtr<Event> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, Event*); -Event* toEvent(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, Event*); +Event* toEvent(JSC::JSValue); class JSEventPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -73,46 +74,46 @@ public: // Functions -JSC::JSValuePtr jsEventPrototypeFunctionStopPropagation(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsEventPrototypeFunctionPreventDefault(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsEventPrototypeFunctionInitEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsEventPrototypeFunctionStopPropagation(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsEventPrototypeFunctionPreventDefault(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsEventPrototypeFunctionInitEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsEventType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventCurrentTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventEventPhase(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventBubbles(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventCancelable(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventTimeStamp(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventSrcElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventReturnValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventReturnValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventCancelBubble(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventCancelBubble(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventClipboardData(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventCurrentTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventEventPhase(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventBubbles(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventCancelable(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventTimeStamp(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventSrcElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventReturnValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSEventReturnValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsEventCancelBubble(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSEventCancelBubble(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsEventClipboardData(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsEventCAPTURING_PHASE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventAT_TARGET(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventBUBBLING_PHASE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventMOUSEDOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventMOUSEUP(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventMOUSEOVER(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventMOUSEOUT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventMOUSEMOVE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventMOUSEDRAG(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventCLICK(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventDBLCLICK(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventKEYDOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventKEYUP(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventKEYPRESS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventDRAGDROP(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventFOCUS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventBLUR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventSELECT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventCHANGE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventCAPTURING_PHASE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventAT_TARGET(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventBUBBLING_PHASE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventMOUSEDOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventMOUSEUP(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventMOUSEOVER(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventMOUSEOUT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventMOUSEMOVE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventMOUSEDRAG(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventCLICK(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventDBLCLICK(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventKEYDOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventKEYUP(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventKEYPRESS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventDRAGDROP(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventFOCUS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventBLUR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventSELECT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventCHANGE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSEventException.cpp b/src/3rdparty/webkit/WebCore/generated/JSEventException.cpp index 547e802795..38cd5517ae 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEventException.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSEventException.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSEventException) +ASSERT_CLASS_FITS_IN_CELL(JSEventException); /* Hash table */ @@ -75,13 +75,13 @@ public: JSEventExceptionConstructor(ExecState* exec) : DOMObject(JSEventExceptionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSEventExceptionPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSEventExceptionPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -110,19 +110,27 @@ static const HashTable JSEventExceptionPrototypeTable = { 5, 3, JSEventExceptionPrototypeTableValues, 0 }; #endif -const ClassInfo JSEventExceptionPrototype::s_info = { "EventExceptionPrototype", 0, &JSEventExceptionPrototypeTable, 0 }; +static const HashTable* getJSEventExceptionPrototypeTable(ExecState* exec) +{ + return getHashTableForGlobalData(exec->globalData(), &JSEventExceptionPrototypeTable); +} +const ClassInfo JSEventExceptionPrototype::s_info = { "EventExceptionPrototype", 0, 0, getJSEventExceptionPrototypeTable }; -JSObject* JSEventExceptionPrototype::self(ExecState* exec) +JSObject* JSEventExceptionPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSEventException>(exec); + return getDOMPrototype<JSEventException>(exec, globalObject); } bool JSEventExceptionPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { - return getStaticPropertySlot<JSEventExceptionPrototype, JSObject>(exec, &JSEventExceptionPrototypeTable, this, propertyName, slot); + return getStaticPropertySlot<JSEventExceptionPrototype, JSObject>(exec, getJSEventExceptionPrototypeTable(exec), this, propertyName, slot); } -const ClassInfo JSEventException::s_info = { "EventException", 0, &JSEventExceptionTable, 0 }; +static const HashTable* getJSEventExceptionTable(ExecState* exec) +{ + return getHashTableForGlobalData(exec->globalData(), &JSEventExceptionTable); +} +const ClassInfo JSEventException::s_info = { "EventException", 0, 0, getJSEventExceptionTable }; JSEventException::JSEventException(PassRefPtr<Structure> structure, PassRefPtr<EventException> impl) : DOMObject(structure) @@ -133,72 +141,75 @@ JSEventException::JSEventException(PassRefPtr<Structure> structure, PassRefPtr<E JSEventException::~JSEventException() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSEventException::createPrototype(ExecState* exec) +JSObject* JSEventException::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSEventExceptionPrototype(JSEventExceptionPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSEventExceptionPrototype(JSEventExceptionPrototype::createStructure(globalObject->objectPrototype())); } bool JSEventException::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { - return getStaticValueSlot<JSEventException, Base>(exec, &JSEventExceptionTable, this, propertyName, slot); + return getStaticValueSlot<JSEventException, Base>(exec, getJSEventExceptionTable(exec), this, propertyName, slot); } -JSValuePtr jsEventExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEventExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); EventException* imp = static_cast<EventException*>(static_cast<JSEventException*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->code()); } -JSValuePtr jsEventExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEventExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); EventException* imp = static_cast<EventException*>(static_cast<JSEventException*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsEventExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEventExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); EventException* imp = static_cast<EventException*>(static_cast<JSEventException*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->message()); } -JSValuePtr jsEventExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsEventExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSEventException*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSEventException::getConstructor(ExecState* exec) +JSValue JSEventException::getConstructor(ExecState* exec) { return getDOMConstructor<JSEventExceptionConstructor>(exec); } -JSValuePtr jsEventExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsEventExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSEventException::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSEventException::s_info)) return throwError(exec, TypeError); JSEventException* castedThisObj = static_cast<JSEventException*>(asObject(thisValue)); EventException* imp = static_cast<EventException*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsString(exec, imp->toString()); + JSC::JSValue result = jsString(exec, imp->toString()); return result; } // Constant getters -JSValuePtr jsEventExceptionUNSPECIFIED_EVENT_TYPE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsEventExceptionUNSPECIFIED_EVENT_TYPE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, EventException* object) +JSC::JSValue toJS(JSC::ExecState* exec, EventException* object) { return getDOMObjectWrapper<JSEventException>(exec, object); } -EventException* toEventException(JSC::JSValuePtr value) +EventException* toEventException(JSC::JSValue value) { - return value->isObject(&JSEventException::s_info) ? static_cast<JSEventException*>(asObject(value))->impl() : 0; + return value.isObject(&JSEventException::s_info) ? static_cast<JSEventException*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSEventException.h b/src/3rdparty/webkit/WebCore/generated/JSEventException.h index d70dbffeda..bc71abe9e4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEventException.h +++ b/src/3rdparty/webkit/WebCore/generated/JSEventException.h @@ -34,33 +34,34 @@ class JSEventException : public DOMObject { public: JSEventException(PassRefPtr<JSC::Structure>, PassRefPtr<EventException>); virtual ~JSEventException(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); EventException* impl() const { return m_impl.get(); } private: RefPtr<EventException> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, EventException*); -EventException* toEventException(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, EventException*); +EventException* toEventException(JSC::JSValue); class JSEventExceptionPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -69,16 +70,16 @@ public: // Functions -JSC::JSValuePtr jsEventExceptionPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsEventExceptionPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsEventExceptionCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventExceptionName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventExceptionMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsEventExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventExceptionCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventExceptionName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventExceptionMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsEventExceptionUNSPECIFIED_EVENT_TYPE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsEventExceptionUNSPECIFIED_EVENT_TYPE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSEventTargetNode.cpp b/src/3rdparty/webkit/WebCore/generated/JSEventTargetNode.cpp deleted file mode 100644 index 3dd23d15c4..0000000000 --- a/src/3rdparty/webkit/WebCore/generated/JSEventTargetNode.cpp +++ /dev/null @@ -1,944 +0,0 @@ -/* - This file is part of the WebKit open source project. - This file has been generated by generate-bindings.pl. DO NOT MODIFY! - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "config.h" - -#include "JSEventTargetNode.h" - -#include <wtf/GetPtr.h> - -#include "Event.h" -#include "EventListener.h" -#include "EventTargetNode.h" -#include "Frame.h" -#include "JSDOMGlobalObject.h" -#include "JSEvent.h" -#include "JSEventListener.h" - -#include <runtime/Error.h> - -using namespace JSC; - -namespace WebCore { - -ASSERT_CLASS_FITS_IN_CELL(JSEventTargetNode) - -/* Hash table */ - -static const HashTableValue JSEventTargetNodeTableValues[41] = -{ - { "onabort", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnabort, (intptr_t)setJSEventTargetNodeOnabort }, - { "onblur", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnblur, (intptr_t)setJSEventTargetNodeOnblur }, - { "onchange", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnchange, (intptr_t)setJSEventTargetNodeOnchange }, - { "onclick", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnclick, (intptr_t)setJSEventTargetNodeOnclick }, - { "oncontextmenu", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOncontextmenu, (intptr_t)setJSEventTargetNodeOncontextmenu }, - { "ondblclick", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOndblclick, (intptr_t)setJSEventTargetNodeOndblclick }, - { "onerror", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnerror, (intptr_t)setJSEventTargetNodeOnerror }, - { "onfocus", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnfocus, (intptr_t)setJSEventTargetNodeOnfocus }, - { "oninput", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOninput, (intptr_t)setJSEventTargetNodeOninput }, - { "onkeydown", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnkeydown, (intptr_t)setJSEventTargetNodeOnkeydown }, - { "onkeypress", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnkeypress, (intptr_t)setJSEventTargetNodeOnkeypress }, - { "onkeyup", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnkeyup, (intptr_t)setJSEventTargetNodeOnkeyup }, - { "onload", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnload, (intptr_t)setJSEventTargetNodeOnload }, - { "onmousedown", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnmousedown, (intptr_t)setJSEventTargetNodeOnmousedown }, - { "onmousemove", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnmousemove, (intptr_t)setJSEventTargetNodeOnmousemove }, - { "onmouseout", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnmouseout, (intptr_t)setJSEventTargetNodeOnmouseout }, - { "onmouseover", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnmouseover, (intptr_t)setJSEventTargetNodeOnmouseover }, - { "onmouseup", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnmouseup, (intptr_t)setJSEventTargetNodeOnmouseup }, - { "onmousewheel", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnmousewheel, (intptr_t)setJSEventTargetNodeOnmousewheel }, - { "onbeforecut", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnbeforecut, (intptr_t)setJSEventTargetNodeOnbeforecut }, - { "oncut", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOncut, (intptr_t)setJSEventTargetNodeOncut }, - { "onbeforecopy", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnbeforecopy, (intptr_t)setJSEventTargetNodeOnbeforecopy }, - { "oncopy", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOncopy, (intptr_t)setJSEventTargetNodeOncopy }, - { "onbeforepaste", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnbeforepaste, (intptr_t)setJSEventTargetNodeOnbeforepaste }, - { "onpaste", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnpaste, (intptr_t)setJSEventTargetNodeOnpaste }, - { "ondragenter", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOndragenter, (intptr_t)setJSEventTargetNodeOndragenter }, - { "ondragover", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOndragover, (intptr_t)setJSEventTargetNodeOndragover }, - { "ondragleave", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOndragleave, (intptr_t)setJSEventTargetNodeOndragleave }, - { "ondrop", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOndrop, (intptr_t)setJSEventTargetNodeOndrop }, - { "ondragstart", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOndragstart, (intptr_t)setJSEventTargetNodeOndragstart }, - { "ondrag", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOndrag, (intptr_t)setJSEventTargetNodeOndrag }, - { "ondragend", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOndragend, (intptr_t)setJSEventTargetNodeOndragend }, - { "onreset", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnreset, (intptr_t)setJSEventTargetNodeOnreset }, - { "onresize", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnresize, (intptr_t)setJSEventTargetNodeOnresize }, - { "onscroll", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnscroll, (intptr_t)setJSEventTargetNodeOnscroll }, - { "onsearch", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnsearch, (intptr_t)setJSEventTargetNodeOnsearch }, - { "onselect", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnselect, (intptr_t)setJSEventTargetNodeOnselect }, - { "onselectstart", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnselectstart, (intptr_t)setJSEventTargetNodeOnselectstart }, - { "onsubmit", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnsubmit, (intptr_t)setJSEventTargetNodeOnsubmit }, - { "onunload", DontDelete|DontEnum, (intptr_t)jsEventTargetNodeOnunload, (intptr_t)setJSEventTargetNodeOnunload }, - { 0, 0, 0, 0 } -}; - -static const HashTable JSEventTargetNodeTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 2047, JSEventTargetNodeTableValues, 0 }; -#else - { 133, 127, JSEventTargetNodeTableValues, 0 }; -#endif - -/* Hash table for prototype */ - -static const HashTableValue JSEventTargetNodePrototypeTableValues[4] = -{ - { "addEventListener", DontDelete|Function, (intptr_t)jsEventTargetNodePrototypeFunctionAddEventListener, (intptr_t)3 }, - { "removeEventListener", DontDelete|Function, (intptr_t)jsEventTargetNodePrototypeFunctionRemoveEventListener, (intptr_t)3 }, - { "dispatchEvent", DontDelete|Function, (intptr_t)jsEventTargetNodePrototypeFunctionDispatchEvent, (intptr_t)1 }, - { 0, 0, 0, 0 } -}; - -static const HashTable JSEventTargetNodePrototypeTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 3, JSEventTargetNodePrototypeTableValues, 0 }; -#else - { 8, 7, JSEventTargetNodePrototypeTableValues, 0 }; -#endif - -const ClassInfo JSEventTargetNodePrototype::s_info = { "EventTargetNodePrototype", 0, &JSEventTargetNodePrototypeTable, 0 }; - -JSObject* JSEventTargetNodePrototype::self(ExecState* exec) -{ - return getDOMPrototype<JSEventTargetNode>(exec); -} - -bool JSEventTargetNodePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) -{ - return getStaticFunctionSlot<JSObject>(exec, &JSEventTargetNodePrototypeTable, this, propertyName, slot); -} - -const ClassInfo JSEventTargetNode::s_info = { "EventTargetNode", &JSNode::s_info, &JSEventTargetNodeTable, 0 }; - -JSEventTargetNode::JSEventTargetNode(PassRefPtr<Structure> structure, PassRefPtr<EventTargetNode> impl) - : JSNode(structure, impl) -{ -} - -JSObject* JSEventTargetNode::createPrototype(ExecState* exec) -{ - return new (exec) JSEventTargetNodePrototype(JSEventTargetNodePrototype::createStructure(JSNodePrototype::self(exec))); -} - -bool JSEventTargetNode::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) -{ - return getStaticValueSlot<JSEventTargetNode, Base>(exec, &JSEventTargetNodeTable, this, propertyName, slot); -} - -JSValuePtr jsEventTargetNodeOnabort(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onabort())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnblur(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onblur())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnchange(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onchange())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnclick(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onclick())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOncontextmenu(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->oncontextmenu())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOndblclick(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondblclick())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onerror())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnfocus(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onfocus())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOninput(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->oninput())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnkeydown(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onkeydown())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnkeypress(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onkeypress())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnkeyup(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onkeyup())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnload(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onload())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnmousedown(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmousedown())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnmousemove(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmousemove())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnmouseout(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmouseout())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnmouseover(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmouseover())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnmouseup(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmouseup())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnmousewheel(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmousewheel())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnbeforecut(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onbeforecut())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOncut(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->oncut())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnbeforecopy(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onbeforecopy())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOncopy(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->oncopy())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnbeforepaste(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onbeforepaste())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnpaste(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onpaste())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOndragenter(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondragenter())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOndragover(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondragover())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOndragleave(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondragleave())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOndrop(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondrop())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOndragstart(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondragstart())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOndrag(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondrag())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOndragend(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondragend())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnreset(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onreset())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnresize(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onresize())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnscroll(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onscroll())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnsearch(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onsearch())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnselect(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onselect())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnselectstart(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onselectstart())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnsubmit(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onsubmit())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -JSValuePtr jsEventTargetNodeOnunload(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onunload())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); -} - -void JSEventTargetNode::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) -{ - lookupPut<JSEventTargetNode, Base>(exec, propertyName, value, &JSEventTargetNodeTable, this, slot); -} - -void setJSEventTargetNodeOnabort(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnabort(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnblur(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnblur(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnchange(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnchange(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnclick(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnclick(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOncontextmenu(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOncontextmenu(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOndblclick(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOndblclick(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnerror(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnerror(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnfocus(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnfocus(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOninput(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOninput(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnkeydown(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnkeydown(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnkeypress(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnkeypress(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnkeyup(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnkeyup(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnload(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnload(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnmousedown(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnmousedown(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnmousemove(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnmousemove(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnmouseout(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnmouseout(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnmouseover(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnmouseover(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnmouseup(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnmouseup(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnmousewheel(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnmousewheel(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnbeforecut(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnbeforecut(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOncut(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOncut(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnbeforecopy(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnbeforecopy(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOncopy(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOncopy(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnbeforepaste(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnbeforepaste(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnpaste(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnpaste(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOndragenter(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOndragenter(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOndragover(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOndragover(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOndragleave(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOndragleave(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOndrop(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOndrop(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOndragstart(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOndragstart(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOndrag(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOndrag(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOndragend(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOndragend(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnreset(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnreset(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnresize(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnresize(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnscroll(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnscroll(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnsearch(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnsearch(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnselect(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnselect(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnselectstart(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnselectstart(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnsubmit(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnsubmit(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -void setJSEventTargetNodeOnunload(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - EventTargetNode* imp = static_cast<EventTargetNode*>(static_cast<JSEventTargetNode*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnunload(globalObject->findOrCreateJSEventListener(exec, value, true)); -} - -JSValuePtr jsEventTargetNodePrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) -{ - if (!thisValue->isObject(&JSEventTargetNode::s_info)) - return throwError(exec, TypeError); - JSEventTargetNode* castedThisObj = static_cast<JSEventTargetNode*>(asObject(thisValue)); - return castedThisObj->addEventListener(exec, args); -} - -JSValuePtr jsEventTargetNodePrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) -{ - if (!thisValue->isObject(&JSEventTargetNode::s_info)) - return throwError(exec, TypeError); - JSEventTargetNode* castedThisObj = static_cast<JSEventTargetNode*>(asObject(thisValue)); - return castedThisObj->removeEventListener(exec, args); -} - -JSValuePtr jsEventTargetNodePrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) -{ - if (!thisValue->isObject(&JSEventTargetNode::s_info)) - return throwError(exec, TypeError); - JSEventTargetNode* castedThisObj = static_cast<JSEventTargetNode*>(asObject(thisValue)); - EventTargetNode* imp = static_cast<EventTargetNode*>(castedThisObj->impl()); - ExceptionCode ec = 0; - Event* event = toEvent(args.at(exec, 0)); - - - JSC::JSValuePtr result = jsBoolean(imp->dispatchEvent(event, ec)); - setDOMException(exec, ec); - return result; -} - -EventTargetNode* toEventTargetNode(JSC::JSValuePtr value) -{ - return value->isObject(&JSEventTargetNode::s_info) ? static_cast<JSEventTargetNode*>(asObject(value))->impl() : 0; -} - -} diff --git a/src/3rdparty/webkit/WebCore/generated/JSEventTargetNode.h b/src/3rdparty/webkit/WebCore/generated/JSEventTargetNode.h deleted file mode 100644 index 0463376c2d..0000000000 --- a/src/3rdparty/webkit/WebCore/generated/JSEventTargetNode.h +++ /dev/null @@ -1,162 +0,0 @@ -/* - This file is part of the WebKit open source project. - This file has been generated by generate-bindings.pl. DO NOT MODIFY! - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef JSEventTargetNode_h -#define JSEventTargetNode_h - -#include "JSNode.h" -#include "EventTargetNode.h" -namespace WebCore { - -class EventTargetNode; - -class JSEventTargetNode : public JSNode { - typedef JSNode Base; -public: - JSEventTargetNode(PassRefPtr<JSC::Structure>, PassRefPtr<EventTargetNode>); - static JSC::JSObject* createPrototype(JSC::ExecState*); - virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); - virtual const JSC::ClassInfo* classInfo() const { return &s_info; } - static const JSC::ClassInfo s_info; - - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) - { - return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); - } - - virtual void pushEventHandlerScope(JSC::ExecState*, JSC::ScopeChain&) const; - - - // Custom functions - JSC::JSValuePtr addEventListener(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr removeEventListener(JSC::ExecState*, const JSC::ArgList&); - EventTargetNode* impl() const - { - return static_cast<EventTargetNode*>(Base::impl()); - } -}; - -EventTargetNode* toEventTargetNode(JSC::JSValuePtr); - -class JSEventTargetNodePrototype : public JSC::JSObject { -public: - static JSC::JSObject* self(JSC::ExecState*); - virtual const JSC::ClassInfo* classInfo() const { return &s_info; } - static const JSC::ClassInfo s_info; - virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) - { - return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); - } - JSEventTargetNodePrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } -}; - -// Functions - -JSC::JSValuePtr jsEventTargetNodePrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsEventTargetNodePrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsEventTargetNodePrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -// Attributes - -JSC::JSValuePtr jsEventTargetNodeOnabort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnabort(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnblur(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnblur(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnchange(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnchange(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnclick(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnclick(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOncontextmenu(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOncontextmenu(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOndblclick(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOndblclick(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnfocus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnfocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOninput(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOninput(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnkeydown(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnkeydown(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnkeypress(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnkeypress(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnkeyup(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnkeyup(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnload(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnmousedown(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnmousedown(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnmousemove(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnmousemove(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnmouseout(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnmouseout(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnmouseover(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnmouseover(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnmouseup(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnmouseup(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnmousewheel(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnmousewheel(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnbeforecut(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnbeforecut(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOncut(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOncut(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnbeforecopy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnbeforecopy(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOncopy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOncopy(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnbeforepaste(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnbeforepaste(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnpaste(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnpaste(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOndragenter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOndragenter(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOndragover(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOndragover(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOndragleave(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOndragleave(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOndrop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOndrop(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOndragstart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOndragstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOndrag(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOndrag(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOndragend(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOndragend(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnreset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnreset(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnresize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnresize(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnscroll(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnscroll(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnsearch(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnsearch(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnselect(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnselect(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnselectstart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnselectstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnsubmit(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnsubmit(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsEventTargetNodeOnunload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSEventTargetNodeOnunload(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); - -} // namespace WebCore - -#endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSFile.cpp b/src/3rdparty/webkit/WebCore/generated/JSFile.cpp index cbb4281ddf..01c6a2cbd9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSFile.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSFile.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSFile) +ASSERT_CLASS_FITS_IN_CELL(JSFile); /* Hash table */ @@ -72,13 +72,13 @@ public: JSFileConstructor(ExecState* exec) : DOMObject(JSFileConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSFilePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSFilePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -107,9 +107,9 @@ static const HashTable JSFilePrototypeTable = const ClassInfo JSFilePrototype::s_info = { "FilePrototype", 0, &JSFilePrototypeTable, 0 }; -JSObject* JSFilePrototype::self(ExecState* exec) +JSObject* JSFilePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSFile>(exec); + return getDOMPrototype<JSFile>(exec, globalObject); } const ClassInfo JSFile::s_info = { "File", 0, &JSFileTable, 0 }; @@ -123,12 +123,11 @@ JSFile::JSFile(PassRefPtr<Structure> structure, PassRefPtr<File> impl) JSFile::~JSFile() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSFile::createPrototype(ExecState* exec) +JSObject* JSFile::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSFilePrototype(JSFilePrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSFilePrototype(JSFilePrototype::createStructure(globalObject->objectPrototype())); } bool JSFile::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -136,34 +135,36 @@ bool JSFile::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, return getStaticValueSlot<JSFile, Base>(exec, &JSFileTable, this, propertyName, slot); } -JSValuePtr jsFileFileName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsFileFileName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); File* imp = static_cast<File*>(static_cast<JSFile*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->fileName()); } -JSValuePtr jsFileFileSize(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsFileFileSize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); File* imp = static_cast<File*>(static_cast<JSFile*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->fileSize()); } -JSValuePtr jsFileConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsFileConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSFile*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSFile::getConstructor(ExecState* exec) +JSValue JSFile::getConstructor(ExecState* exec) { return getDOMConstructor<JSFileConstructor>(exec); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, File* object) +JSC::JSValue toJS(JSC::ExecState* exec, File* object) { return getDOMObjectWrapper<JSFile>(exec, object); } -File* toFile(JSC::JSValuePtr value) +File* toFile(JSC::JSValue value) { - return value->isObject(&JSFile::s_info) ? static_cast<JSFile*>(asObject(value))->impl() : 0; + return value.isObject(&JSFile::s_info) ? static_cast<JSFile*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSFile.h b/src/3rdparty/webkit/WebCore/generated/JSFile.h index 0c7b83ca03..efa4744a09 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSFile.h +++ b/src/3rdparty/webkit/WebCore/generated/JSFile.h @@ -34,29 +34,30 @@ class JSFile : public DOMObject { public: JSFile(PassRefPtr<JSC::Structure>, PassRefPtr<File>); virtual ~JSFile(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); File* impl() const { return m_impl.get(); } private: RefPtr<File> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, File*); -File* toFile(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, File*); +File* toFile(JSC::JSValue); class JSFilePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSFilePrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -64,9 +65,9 @@ public: // Attributes -JSC::JSValuePtr jsFileFileName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsFileFileSize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsFileConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsFileFileName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsFileFileSize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsFileConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSFileList.cpp b/src/3rdparty/webkit/WebCore/generated/JSFileList.cpp index baf82c8e3b..7b84c66b55 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSFileList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSFileList.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSFileList) +ASSERT_CLASS_FITS_IN_CELL(JSFileList); /* Hash table */ @@ -74,13 +74,13 @@ public: JSFileListConstructor(ExecState* exec) : DOMObject(JSFileListConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSFileListPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSFileListPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -110,9 +110,9 @@ static const HashTable JSFileListPrototypeTable = const ClassInfo JSFileListPrototype::s_info = { "FileListPrototype", 0, &JSFileListPrototypeTable, 0 }; -JSObject* JSFileListPrototype::self(ExecState* exec) +JSObject* JSFileListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSFileList>(exec); + return getDOMPrototype<JSFileList>(exec, globalObject); } bool JSFileListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -131,12 +131,11 @@ JSFileList::JSFileList(PassRefPtr<Structure> structure, PassRefPtr<FileList> imp JSFileList::~JSFileList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSFileList::createPrototype(ExecState* exec) +JSObject* JSFileList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSFileListPrototype(JSFileListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSFileListPrototype(JSFileListPrototype::createStructure(globalObject->objectPrototype())); } bool JSFileList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -164,13 +163,14 @@ bool JSFileList::getOwnPropertySlot(ExecState* exec, unsigned propertyName, Prop return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -JSValuePtr jsFileListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsFileListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); FileList* imp = static_cast<FileList*>(static_cast<JSFileList*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsFileListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsFileListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSFileList*>(asObject(slot.slotBase()))->getConstructor(exec); } @@ -181,41 +181,42 @@ void JSFileList::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNa Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSFileList::getConstructor(ExecState* exec) +JSValue JSFileList::getConstructor(ExecState* exec) { return getDOMConstructor<JSFileListConstructor>(exec); } -JSValuePtr jsFileListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsFileListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSFileList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSFileList::s_info)) return throwError(exec, TypeError); JSFileList* castedThisObj = static_cast<JSFileList*>(asObject(thisValue)); FileList* imp = static_cast<FileList*>(castedThisObj->impl()); - int index = args.at(exec, 0)->toInt32(exec); + int index = args.at(0).toInt32(exec); if (index < 0) { setDOMException(exec, INDEX_SIZE_ERR); return jsUndefined(); } - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); return result; } -JSValuePtr JSFileList::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue JSFileList::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSFileList* thisObj = static_cast<JSFileList*>(asObject(slot.slotBase())); return toJS(exec, static_cast<FileList*>(thisObj->impl())->item(slot.index())); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, FileList* object) +JSC::JSValue toJS(JSC::ExecState* exec, FileList* object) { return getDOMObjectWrapper<JSFileList>(exec, object); } -FileList* toFileList(JSC::JSValuePtr value) +FileList* toFileList(JSC::JSValue value) { - return value->isObject(&JSFileList::s_info) ? static_cast<JSFileList*>(asObject(value))->impl() : 0; + return value.isObject(&JSFileList::s_info) ? static_cast<JSFileList*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSFileList.h b/src/3rdparty/webkit/WebCore/generated/JSFileList.h index 87628cef8a..4a7075d2ab 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSFileList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSFileList.h @@ -34,36 +34,37 @@ class JSFileList : public DOMObject { public: JSFileList(PassRefPtr<JSC::Structure>, PassRefPtr<FileList>); virtual ~JSFileList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); FileList* impl() const { return m_impl.get(); } private: RefPtr<FileList> m_impl; - static JSC::JSValuePtr indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValuePtr toJS(JSC::ExecState*, FileList*); -FileList* toFileList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, FileList*); +FileList* toFileList(JSC::JSValue); class JSFileListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -72,11 +73,11 @@ public: // Functions -JSC::JSValuePtr jsFileListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsFileListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsFileListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsFileListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsFileListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsFileListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSGeolocation.cpp b/src/3rdparty/webkit/WebCore/generated/JSGeolocation.cpp index 1d02e9004f..928e5768a5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSGeolocation.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSGeolocation.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSGeolocation) +ASSERT_CLASS_FITS_IN_CELL(JSGeolocation); /* Hash table */ @@ -70,9 +70,9 @@ static const HashTable JSGeolocationPrototypeTable = const ClassInfo JSGeolocationPrototype::s_info = { "GeolocationPrototype", 0, &JSGeolocationPrototypeTable, 0 }; -JSObject* JSGeolocationPrototype::self(ExecState* exec) +JSObject* JSGeolocationPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSGeolocation>(exec); + return getDOMPrototype<JSGeolocation>(exec, globalObject); } bool JSGeolocationPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -91,12 +91,11 @@ JSGeolocation::JSGeolocation(PassRefPtr<Structure> structure, PassRefPtr<Geoloca JSGeolocation::~JSGeolocation() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSGeolocation::createPrototype(ExecState* exec) +JSObject* JSGeolocation::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSGeolocationPrototype(JSGeolocationPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSGeolocationPrototype(JSGeolocationPrototype::createStructure(globalObject->objectPrototype())); } bool JSGeolocation::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -104,47 +103,51 @@ bool JSGeolocation::getOwnPropertySlot(ExecState* exec, const Identifier& proper return getStaticValueSlot<JSGeolocation, Base>(exec, &JSGeolocationTable, this, propertyName, slot); } -JSValuePtr jsGeolocationLastPosition(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsGeolocationLastPosition(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Geolocation* imp = static_cast<Geolocation*>(static_cast<JSGeolocation*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->lastPosition())); } -JSValuePtr jsGeolocationPrototypeFunctionGetCurrentPosition(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsGeolocationPrototypeFunctionGetCurrentPosition(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSGeolocation::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSGeolocation::s_info)) return throwError(exec, TypeError); JSGeolocation* castedThisObj = static_cast<JSGeolocation*>(asObject(thisValue)); return castedThisObj->getCurrentPosition(exec, args); } -JSValuePtr jsGeolocationPrototypeFunctionWatchPosition(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsGeolocationPrototypeFunctionWatchPosition(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSGeolocation::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSGeolocation::s_info)) return throwError(exec, TypeError); JSGeolocation* castedThisObj = static_cast<JSGeolocation*>(asObject(thisValue)); return castedThisObj->watchPosition(exec, args); } -JSValuePtr jsGeolocationPrototypeFunctionClearWatch(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsGeolocationPrototypeFunctionClearWatch(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSGeolocation::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSGeolocation::s_info)) return throwError(exec, TypeError); JSGeolocation* castedThisObj = static_cast<JSGeolocation*>(asObject(thisValue)); Geolocation* imp = static_cast<Geolocation*>(castedThisObj->impl()); - int watchId = args.at(exec, 0)->toInt32(exec); + int watchId = args.at(0).toInt32(exec); imp->clearWatch(watchId); return jsUndefined(); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, Geolocation* object) +JSC::JSValue toJS(JSC::ExecState* exec, Geolocation* object) { return getDOMObjectWrapper<JSGeolocation>(exec, object); } -Geolocation* toGeolocation(JSC::JSValuePtr value) +Geolocation* toGeolocation(JSC::JSValue value) { - return value->isObject(&JSGeolocation::s_info) ? static_cast<JSGeolocation*>(asObject(value))->impl() : 0; + return value.isObject(&JSGeolocation::s_info) ? static_cast<JSGeolocation*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSGeolocation.h b/src/3rdparty/webkit/WebCore/generated/JSGeolocation.h index d73810205d..736d019817 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSGeolocation.h +++ b/src/3rdparty/webkit/WebCore/generated/JSGeolocation.h @@ -34,36 +34,37 @@ class JSGeolocation : public DOMObject { public: JSGeolocation(PassRefPtr<JSC::Structure>, PassRefPtr<Geolocation>); virtual ~JSGeolocation(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } // Custom functions - JSC::JSValuePtr getCurrentPosition(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr watchPosition(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue getCurrentPosition(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue watchPosition(JSC::ExecState*, const JSC::ArgList&); Geolocation* impl() const { return m_impl.get(); } private: RefPtr<Geolocation> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, Geolocation*); -Geolocation* toGeolocation(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, Geolocation*); +Geolocation* toGeolocation(JSC::JSValue); class JSGeolocationPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -72,12 +73,12 @@ public: // Functions -JSC::JSValuePtr jsGeolocationPrototypeFunctionGetCurrentPosition(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsGeolocationPrototypeFunctionWatchPosition(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsGeolocationPrototypeFunctionClearWatch(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsGeolocationPrototypeFunctionGetCurrentPosition(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsGeolocationPrototypeFunctionWatchPosition(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsGeolocationPrototypeFunctionClearWatch(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsGeolocationLastPosition(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsGeolocationLastPosition(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSGeoposition.cpp b/src/3rdparty/webkit/WebCore/generated/JSGeoposition.cpp index fea5d2f2e7..5d13cc6816 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSGeoposition.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSGeoposition.cpp @@ -24,7 +24,9 @@ #include <wtf/GetPtr.h> +#include "Coordinates.h" #include "Geoposition.h" +#include "JSCoordinates.h" #include "KURL.h" #include <runtime/Error.h> @@ -35,28 +37,22 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSGeoposition) +ASSERT_CLASS_FITS_IN_CELL(JSGeoposition); /* Hash table */ -static const HashTableValue JSGeopositionTableValues[9] = +static const HashTableValue JSGeopositionTableValues[3] = { - { "latitude", DontDelete|ReadOnly, (intptr_t)jsGeopositionLatitude, (intptr_t)0 }, - { "longitude", DontDelete|ReadOnly, (intptr_t)jsGeopositionLongitude, (intptr_t)0 }, - { "altitude", DontDelete|ReadOnly, (intptr_t)jsGeopositionAltitude, (intptr_t)0 }, - { "accuracy", DontDelete|ReadOnly, (intptr_t)jsGeopositionAccuracy, (intptr_t)0 }, - { "altitudeAccuracy", DontDelete|ReadOnly, (intptr_t)jsGeopositionAltitudeAccuracy, (intptr_t)0 }, - { "heading", DontDelete|ReadOnly, (intptr_t)jsGeopositionHeading, (intptr_t)0 }, - { "speed", DontDelete|ReadOnly, (intptr_t)jsGeopositionSpeed, (intptr_t)0 }, + { "coords", DontDelete|ReadOnly, (intptr_t)jsGeopositionCoords, (intptr_t)0 }, { "timestamp", DontDelete|ReadOnly, (intptr_t)jsGeopositionTimestamp, (intptr_t)0 }, { 0, 0, 0, 0 } }; static const HashTable JSGeopositionTable = #if ENABLE(PERFECT_HASH_SIZE) - { 255, JSGeopositionTableValues, 0 }; + { 3, JSGeopositionTableValues, 0 }; #else - { 17, 15, JSGeopositionTableValues, 0 }; + { 4, 3, JSGeopositionTableValues, 0 }; #endif /* Hash table for prototype */ @@ -76,9 +72,9 @@ static const HashTable JSGeopositionPrototypeTable = const ClassInfo JSGeopositionPrototype::s_info = { "GeopositionPrototype", 0, &JSGeopositionPrototypeTable, 0 }; -JSObject* JSGeopositionPrototype::self(ExecState* exec) +JSObject* JSGeopositionPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSGeoposition>(exec); + return getDOMPrototype<JSGeoposition>(exec, globalObject); } bool JSGeopositionPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -97,12 +93,11 @@ JSGeoposition::JSGeoposition(PassRefPtr<Structure> structure, PassRefPtr<Geoposi JSGeoposition::~JSGeoposition() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSGeoposition::createPrototype(ExecState* exec) +JSObject* JSGeoposition::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSGeopositionPrototype(JSGeopositionPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSGeopositionPrototype(JSGeopositionPrototype::createStructure(globalObject->objectPrototype())); } bool JSGeoposition::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -110,73 +105,40 @@ bool JSGeoposition::getOwnPropertySlot(ExecState* exec, const Identifier& proper return getStaticValueSlot<JSGeoposition, Base>(exec, &JSGeopositionTable, this, propertyName, slot); } -JSValuePtr jsGeopositionLatitude(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - Geoposition* imp = static_cast<Geoposition*>(static_cast<JSGeoposition*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->latitude()); -} - -JSValuePtr jsGeopositionLongitude(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - Geoposition* imp = static_cast<Geoposition*>(static_cast<JSGeoposition*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->longitude()); -} - -JSValuePtr jsGeopositionAltitude(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - Geoposition* imp = static_cast<Geoposition*>(static_cast<JSGeoposition*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->altitude()); -} - -JSValuePtr jsGeopositionAccuracy(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - Geoposition* imp = static_cast<Geoposition*>(static_cast<JSGeoposition*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->accuracy()); -} - -JSValuePtr jsGeopositionAltitudeAccuracy(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - Geoposition* imp = static_cast<Geoposition*>(static_cast<JSGeoposition*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->altitudeAccuracy()); -} - -JSValuePtr jsGeopositionHeading(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - Geoposition* imp = static_cast<Geoposition*>(static_cast<JSGeoposition*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->heading()); -} - -JSValuePtr jsGeopositionSpeed(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsGeopositionCoords(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Geoposition* imp = static_cast<Geoposition*>(static_cast<JSGeoposition*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->speed()); + return toJS(exec, WTF::getPtr(imp->coords())); } -JSValuePtr jsGeopositionTimestamp(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsGeopositionTimestamp(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Geoposition* imp = static_cast<Geoposition*>(static_cast<JSGeoposition*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->timestamp()); } -JSValuePtr jsGeopositionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsGeopositionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSGeoposition::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSGeoposition::s_info)) return throwError(exec, TypeError); JSGeoposition* castedThisObj = static_cast<JSGeoposition*>(asObject(thisValue)); Geoposition* imp = static_cast<Geoposition*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsString(exec, imp->toString()); + JSC::JSValue result = jsString(exec, imp->toString()); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, Geoposition* object) +JSC::JSValue toJS(JSC::ExecState* exec, Geoposition* object) { return getDOMObjectWrapper<JSGeoposition>(exec, object); } -Geoposition* toGeoposition(JSC::JSValuePtr value) +Geoposition* toGeoposition(JSC::JSValue value) { - return value->isObject(&JSGeoposition::s_info) ? static_cast<JSGeoposition*>(asObject(value))->impl() : 0; + return value.isObject(&JSGeoposition::s_info) ? static_cast<JSGeoposition*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSGeoposition.h b/src/3rdparty/webkit/WebCore/generated/JSGeoposition.h index a7f1ba90de..200bb6e0dc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSGeoposition.h +++ b/src/3rdparty/webkit/WebCore/generated/JSGeoposition.h @@ -34,12 +34,12 @@ class JSGeoposition : public DOMObject { public: JSGeoposition(PassRefPtr<JSC::Structure>, PassRefPtr<Geoposition>); virtual ~JSGeoposition(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -50,16 +50,17 @@ private: RefPtr<Geoposition> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, Geoposition*); -Geoposition* toGeoposition(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, Geoposition*); +Geoposition* toGeoposition(JSC::JSValue); class JSGeopositionPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -68,17 +69,11 @@ public: // Functions -JSC::JSValuePtr jsGeopositionPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsGeopositionPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsGeopositionLatitude(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsGeopositionLongitude(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsGeopositionAltitude(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsGeopositionAccuracy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsGeopositionAltitudeAccuracy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsGeopositionHeading(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsGeopositionSpeed(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsGeopositionTimestamp(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsGeopositionCoords(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsGeopositionTimestamp(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAnchorElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLAnchorElement.cpp index 8198a75555..6d2996a190 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAnchorElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAnchorElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLAnchorElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLAnchorElement); /* Hash table */ @@ -90,13 +90,13 @@ public: JSHTMLAnchorElementConstructor(ExecState* exec) : DOMObject(JSHTMLAnchorElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLAnchorElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLAnchorElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -126,9 +126,9 @@ static const HashTable JSHTMLAnchorElementPrototypeTable = const ClassInfo JSHTMLAnchorElementPrototype::s_info = { "HTMLAnchorElementPrototype", 0, &JSHTMLAnchorElementPrototypeTable, 0 }; -JSObject* JSHTMLAnchorElementPrototype::self(ExecState* exec) +JSObject* JSHTMLAnchorElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLAnchorElement>(exec); + return getDOMPrototype<JSHTMLAnchorElement>(exec, globalObject); } bool JSHTMLAnchorElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -143,9 +143,9 @@ JSHTMLAnchorElement::JSHTMLAnchorElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSHTMLAnchorElement::createPrototype(ExecState* exec) +JSObject* JSHTMLAnchorElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLAnchorElementPrototype(JSHTMLAnchorElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLAnchorElementPrototype(JSHTMLAnchorElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLAnchorElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -153,209 +153,229 @@ bool JSHTMLAnchorElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSHTMLAnchorElement, Base>(exec, &JSHTMLAnchorElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLAnchorElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->accessKey()); } -JSValuePtr jsHTMLAnchorElementCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->charset()); } -JSValuePtr jsHTMLAnchorElementCoords(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementCoords(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->coords()); } -JSValuePtr jsHTMLAnchorElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->href()); } -JSValuePtr jsHTMLAnchorElementHreflang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementHreflang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->hreflang()); } -JSValuePtr jsHTMLAnchorElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsHTMLAnchorElementRel(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementRel(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->rel()); } -JSValuePtr jsHTMLAnchorElementRev(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementRev(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->rev()); } -JSValuePtr jsHTMLAnchorElementShape(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementShape(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->shape()); } -JSValuePtr jsHTMLAnchorElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->target()); } -JSValuePtr jsHTMLAnchorElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsHTMLAnchorElementHash(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementHash(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->hash()); } -JSValuePtr jsHTMLAnchorElementHost(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementHost(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->host()); } -JSValuePtr jsHTMLAnchorElementHostname(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementHostname(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->hostname()); } -JSValuePtr jsHTMLAnchorElementPathname(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementPathname(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->pathname()); } -JSValuePtr jsHTMLAnchorElementPort(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementPort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->port()); } -JSValuePtr jsHTMLAnchorElementProtocol(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementProtocol(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->protocol()); } -JSValuePtr jsHTMLAnchorElementSearch(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementSearch(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->search()); } -JSValuePtr jsHTMLAnchorElementText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->text()); } -JSValuePtr jsHTMLAnchorElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAnchorElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLAnchorElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLAnchorElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLAnchorElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLAnchorElement, Base>(exec, propertyName, value, &JSHTMLAnchorElementTable, this, slot); } -void setJSHTMLAnchorElementAccessKey(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAnchorElementAccessKey(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(thisObject)->impl()); imp->setAccessKey(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAnchorElementCharset(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAnchorElementCharset(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(thisObject)->impl()); imp->setCharset(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAnchorElementCoords(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAnchorElementCoords(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(thisObject)->impl()); imp->setCoords(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAnchorElementHref(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAnchorElementHref(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(thisObject)->impl()); imp->setHref(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAnchorElementHreflang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAnchorElementHreflang(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(thisObject)->impl()); imp->setHreflang(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAnchorElementName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAnchorElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(thisObject)->impl()); imp->setName(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAnchorElementRel(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAnchorElementRel(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(thisObject)->impl()); imp->setRel(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAnchorElementRev(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAnchorElementRev(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(thisObject)->impl()); imp->setRev(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAnchorElementShape(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAnchorElementShape(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(thisObject)->impl()); imp->setShape(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAnchorElementTarget(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAnchorElementTarget(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(thisObject)->impl()); imp->setTarget(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAnchorElementType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAnchorElementType(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(static_cast<JSHTMLAnchorElement*>(thisObject)->impl()); imp->setType(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLAnchorElement::getConstructor(ExecState* exec) +JSValue JSHTMLAnchorElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLAnchorElementConstructor>(exec); } -JSValuePtr jsHTMLAnchorElementPrototypeFunctionToString(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLAnchorElementPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLAnchorElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLAnchorElement::s_info)) return throwError(exec, TypeError); JSHTMLAnchorElement* castedThisObj = static_cast<JSHTMLAnchorElement*>(asObject(thisValue)); HTMLAnchorElement* imp = static_cast<HTMLAnchorElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsString(exec, imp->toString()); + JSC::JSValue result = jsString(exec, imp->toString()); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAnchorElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLAnchorElement.h index 35e0b75982..b7864c41c3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAnchorElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAnchorElement.h @@ -31,28 +31,29 @@ class JSHTMLAnchorElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLAnchorElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLAnchorElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLAnchorElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -61,40 +62,40 @@ public: // Functions -JSC::JSValuePtr jsHTMLAnchorElementPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLAnchorElementPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLAnchorElementAccessKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAnchorElementAccessKey(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAnchorElementCharset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAnchorElementCharset(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAnchorElementCoords(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAnchorElementCoords(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAnchorElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAnchorElementHref(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAnchorElementHreflang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAnchorElementHreflang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAnchorElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAnchorElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAnchorElementRel(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAnchorElementRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAnchorElementRev(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAnchorElementRev(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAnchorElementShape(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAnchorElementShape(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAnchorElementTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAnchorElementTarget(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAnchorElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAnchorElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAnchorElementHash(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLAnchorElementHost(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLAnchorElementHostname(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLAnchorElementPathname(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLAnchorElementPort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLAnchorElementProtocol(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLAnchorElementSearch(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLAnchorElementText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLAnchorElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAnchorElementAccessKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAnchorElementAccessKey(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAnchorElementCharset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAnchorElementCharset(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAnchorElementCoords(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAnchorElementCoords(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAnchorElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAnchorElementHref(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAnchorElementHreflang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAnchorElementHreflang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAnchorElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAnchorElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAnchorElementRel(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAnchorElementRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAnchorElementRev(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAnchorElementRev(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAnchorElementShape(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAnchorElementShape(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAnchorElementTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAnchorElementTarget(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAnchorElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAnchorElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAnchorElementHash(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAnchorElementHost(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAnchorElementHostname(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAnchorElementPathname(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAnchorElementPort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAnchorElementProtocol(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAnchorElementSearch(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAnchorElementText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAnchorElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.cpp index e77aba5ab7..97421776f7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLAppletElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLAppletElement); /* Hash table */ @@ -83,13 +83,13 @@ public: JSHTMLAppletElementConstructor(ExecState* exec) : DOMObject(JSHTMLAppletElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLAppletElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLAppletElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -118,9 +118,9 @@ static const HashTable JSHTMLAppletElementPrototypeTable = const ClassInfo JSHTMLAppletElementPrototype::s_info = { "HTMLAppletElementPrototype", 0, &JSHTMLAppletElementPrototypeTable, 0 }; -JSObject* JSHTMLAppletElementPrototype::self(ExecState* exec) +JSObject* JSHTMLAppletElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLAppletElement>(exec); + return getDOMPrototype<JSHTMLAppletElement>(exec, globalObject); } const ClassInfo JSHTMLAppletElement::s_info = { "HTMLAppletElement", &JSHTMLElement::s_info, &JSHTMLAppletElementTable, 0 }; @@ -130,9 +130,9 @@ JSHTMLAppletElement::JSHTMLAppletElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSHTMLAppletElement::createPrototype(ExecState* exec) +JSObject* JSHTMLAppletElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLAppletElementPrototype(JSHTMLAppletElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLAppletElementPrototype(JSHTMLAppletElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLAppletElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -146,150 +146,161 @@ bool JSHTMLAppletElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSHTMLAppletElement, Base>(exec, &JSHTMLAppletElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLAppletElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAppletElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLAppletElementAlt(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAppletElementAlt(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->alt()); } -JSValuePtr jsHTMLAppletElementArchive(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAppletElementArchive(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->archive()); } -JSValuePtr jsHTMLAppletElementCode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAppletElementCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->code()); } -JSValuePtr jsHTMLAppletElementCodeBase(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAppletElementCodeBase(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->codeBase()); } -JSValuePtr jsHTMLAppletElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAppletElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->height()); } -JSValuePtr jsHTMLAppletElementHspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAppletElementHspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->hspace()); } -JSValuePtr jsHTMLAppletElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAppletElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsHTMLAppletElementObject(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAppletElementObject(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->object()); } -JSValuePtr jsHTMLAppletElementVspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAppletElementVspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->vspace()); } -JSValuePtr jsHTMLAppletElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAppletElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->width()); } -JSValuePtr jsHTMLAppletElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAppletElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLAppletElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLAppletElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLAppletElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { if (customPut(exec, propertyName, value, slot)) return; lookupPut<JSHTMLAppletElement, Base>(exec, propertyName, value, &JSHTMLAppletElementTable, this, slot); } -void setJSHTMLAppletElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAppletElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAppletElementAlt(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAppletElementAlt(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(thisObject)->impl()); imp->setAlt(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAppletElementArchive(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAppletElementArchive(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(thisObject)->impl()); imp->setArchive(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAppletElementCode(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAppletElementCode(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(thisObject)->impl()); imp->setCode(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAppletElementCodeBase(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAppletElementCodeBase(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(thisObject)->impl()); imp->setCodeBase(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAppletElementHeight(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAppletElementHeight(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(thisObject)->impl()); imp->setHeight(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAppletElementHspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAppletElementHspace(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(thisObject)->impl()); imp->setHspace(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAppletElementName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAppletElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(thisObject)->impl()); imp->setName(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAppletElementObject(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAppletElementObject(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(thisObject)->impl()); imp->setObject(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAppletElementVspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAppletElementVspace(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(thisObject)->impl()); imp->setVspace(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAppletElementWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAppletElementWidth(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast<HTMLAppletElement*>(static_cast<JSHTMLAppletElement*>(thisObject)->impl()); imp->setWidth(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLAppletElement::getConstructor(ExecState* exec) +JSValue JSHTMLAppletElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLAppletElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.h index dd64eeb501..754c490d54 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.h @@ -32,31 +32,32 @@ class JSHTMLAppletElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLAppletElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLAppletElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); bool customGetOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); - bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); + bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual JSC::CallType getCallData(JSC::CallData&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); private: static bool canGetItemsForName(JSC::ExecState*, HTMLAppletElement*, const JSC::Identifier&); - static JSC::JSValuePtr nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; class JSHTMLAppletElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLAppletElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -64,29 +65,29 @@ public: // Attributes -JSC::JSValuePtr jsHTMLAppletElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAppletElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAppletElementAlt(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAppletElementAlt(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAppletElementArchive(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAppletElementArchive(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAppletElementCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAppletElementCode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAppletElementCodeBase(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAppletElementCodeBase(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAppletElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAppletElementHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAppletElementHspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAppletElementHspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAppletElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAppletElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAppletElementObject(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAppletElementObject(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAppletElementVspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAppletElementVspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAppletElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAppletElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAppletElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAppletElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAppletElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAppletElementAlt(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAppletElementAlt(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAppletElementArchive(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAppletElementArchive(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAppletElementCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAppletElementCode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAppletElementCodeBase(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAppletElementCodeBase(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAppletElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAppletElementHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAppletElementHspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAppletElementHspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAppletElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAppletElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAppletElementObject(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAppletElementObject(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAppletElementVspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAppletElementVspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAppletElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAppletElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAppletElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAreaElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLAreaElement.cpp index d7d165f40a..be38c8d91e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAreaElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAreaElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLAreaElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLAreaElement); /* Hash table */ @@ -84,13 +84,13 @@ public: JSHTMLAreaElementConstructor(ExecState* exec) : DOMObject(JSHTMLAreaElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLAreaElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLAreaElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -119,9 +119,9 @@ static const HashTable JSHTMLAreaElementPrototypeTable = const ClassInfo JSHTMLAreaElementPrototype::s_info = { "HTMLAreaElementPrototype", 0, &JSHTMLAreaElementPrototypeTable, 0 }; -JSObject* JSHTMLAreaElementPrototype::self(ExecState* exec) +JSObject* JSHTMLAreaElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLAreaElement>(exec); + return getDOMPrototype<JSHTMLAreaElement>(exec, globalObject); } const ClassInfo JSHTMLAreaElement::s_info = { "HTMLAreaElement", &JSHTMLElement::s_info, &JSHTMLAreaElementTable, 0 }; @@ -131,9 +131,9 @@ JSHTMLAreaElement::JSHTMLAreaElement(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSHTMLAreaElement::createPrototype(ExecState* exec) +JSObject* JSHTMLAreaElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLAreaElementPrototype(JSHTMLAreaElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLAreaElementPrototype(JSHTMLAreaElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLAreaElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -141,142 +141,156 @@ bool JSHTMLAreaElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSHTMLAreaElement, Base>(exec, &JSHTMLAreaElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLAreaElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAreaElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->accessKey()); } -JSValuePtr jsHTMLAreaElementAlt(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAreaElementAlt(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->alt()); } -JSValuePtr jsHTMLAreaElementCoords(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAreaElementCoords(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->coords()); } -JSValuePtr jsHTMLAreaElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAreaElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->href()); } -JSValuePtr jsHTMLAreaElementNoHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAreaElementNoHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->noHref()); } -JSValuePtr jsHTMLAreaElementShape(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAreaElementShape(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->shape()); } -JSValuePtr jsHTMLAreaElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAreaElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->target()); } -JSValuePtr jsHTMLAreaElementHash(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAreaElementHash(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->hash()); } -JSValuePtr jsHTMLAreaElementHost(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAreaElementHost(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->host()); } -JSValuePtr jsHTMLAreaElementHostname(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAreaElementHostname(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->hostname()); } -JSValuePtr jsHTMLAreaElementPathname(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAreaElementPathname(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->pathname()); } -JSValuePtr jsHTMLAreaElementPort(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAreaElementPort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->port()); } -JSValuePtr jsHTMLAreaElementProtocol(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAreaElementProtocol(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->protocol()); } -JSValuePtr jsHTMLAreaElementSearch(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAreaElementSearch(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->search()); } -JSValuePtr jsHTMLAreaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAreaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLAreaElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLAreaElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLAreaElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLAreaElement, Base>(exec, propertyName, value, &JSHTMLAreaElementTable, this, slot); } -void setJSHTMLAreaElementAccessKey(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAreaElementAccessKey(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(thisObject)->impl()); imp->setAccessKey(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAreaElementAlt(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAreaElementAlt(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(thisObject)->impl()); imp->setAlt(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAreaElementCoords(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAreaElementCoords(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(thisObject)->impl()); imp->setCoords(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAreaElementHref(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAreaElementHref(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(thisObject)->impl()); imp->setHref(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAreaElementNoHref(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAreaElementNoHref(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(thisObject)->impl()); - imp->setNoHref(value->toBoolean(exec)); + imp->setNoHref(value.toBoolean(exec)); } -void setJSHTMLAreaElementShape(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAreaElementShape(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(thisObject)->impl()); imp->setShape(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLAreaElementTarget(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLAreaElementTarget(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAreaElement* imp = static_cast<HTMLAreaElement*>(static_cast<JSHTMLAreaElement*>(thisObject)->impl()); imp->setTarget(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLAreaElement::getConstructor(ExecState* exec) +JSValue JSHTMLAreaElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLAreaElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAreaElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLAreaElement.h index fe37030961..9d2d8fcfd0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAreaElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAreaElement.h @@ -31,24 +31,25 @@ class JSHTMLAreaElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLAreaElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLAreaElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLAreaElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLAreaElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,28 +57,28 @@ public: // Attributes -JSC::JSValuePtr jsHTMLAreaElementAccessKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAreaElementAccessKey(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAreaElementAlt(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAreaElementAlt(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAreaElementCoords(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAreaElementCoords(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAreaElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAreaElementHref(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAreaElementNoHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAreaElementNoHref(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAreaElementShape(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAreaElementShape(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAreaElementTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLAreaElementTarget(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLAreaElementHash(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLAreaElementHost(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLAreaElementHostname(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLAreaElementPathname(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLAreaElementPort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLAreaElementProtocol(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLAreaElementSearch(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLAreaElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAreaElementAccessKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAreaElementAccessKey(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAreaElementAlt(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAreaElementAlt(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAreaElementCoords(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAreaElementCoords(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAreaElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAreaElementHref(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAreaElementNoHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAreaElementNoHref(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAreaElementShape(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAreaElementShape(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAreaElementTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLAreaElementTarget(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLAreaElementHash(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAreaElementHost(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAreaElementHostname(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAreaElementPathname(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAreaElementPort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAreaElementProtocol(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAreaElementSearch(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAreaElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAudioElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLAudioElement.cpp index 630170e2d7..b2577a48c2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAudioElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAudioElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLAudioElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLAudioElement); /* Hash table */ @@ -71,13 +71,13 @@ public: JSHTMLAudioElementConstructor(ExecState* exec) : DOMObject(JSHTMLAudioElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLAudioElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLAudioElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -106,9 +106,9 @@ static const HashTable JSHTMLAudioElementPrototypeTable = const ClassInfo JSHTMLAudioElementPrototype::s_info = { "HTMLAudioElementPrototype", 0, &JSHTMLAudioElementPrototypeTable, 0 }; -JSObject* JSHTMLAudioElementPrototype::self(ExecState* exec) +JSObject* JSHTMLAudioElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLAudioElement>(exec); + return getDOMPrototype<JSHTMLAudioElement>(exec, globalObject); } const ClassInfo JSHTMLAudioElement::s_info = { "HTMLAudioElement", &JSHTMLMediaElement::s_info, &JSHTMLAudioElementTable, 0 }; @@ -118,9 +118,9 @@ JSHTMLAudioElement::JSHTMLAudioElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSHTMLAudioElement::createPrototype(ExecState* exec) +JSObject* JSHTMLAudioElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLAudioElementPrototype(JSHTMLAudioElementPrototype::createStructure(JSHTMLMediaElementPrototype::self(exec))); + return new (exec) JSHTMLAudioElementPrototype(JSHTMLAudioElementPrototype::createStructure(JSHTMLMediaElementPrototype::self(exec, globalObject))); } bool JSHTMLAudioElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,11 +128,11 @@ bool JSHTMLAudioElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSHTMLAudioElement, Base>(exec, &JSHTMLAudioElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLAudioElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLAudioElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLAudioElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSHTMLAudioElement::getConstructor(ExecState* exec) +JSValue JSHTMLAudioElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLAudioElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAudioElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLAudioElement.h index 3c1672647c..402fc67376 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAudioElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAudioElement.h @@ -34,23 +34,24 @@ class JSHTMLAudioElement : public JSHTMLMediaElement { typedef JSHTMLMediaElement Base; public: JSHTMLAudioElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLAudioElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLAudioElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLAudioElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,7 +59,7 @@ public: // Attributes -JSC::JSValuePtr jsHTMLAudioElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLAudioElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBRElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLBRElement.cpp index 439004c9d5..ce47923760 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBRElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBRElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLBRElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLBRElement); /* Hash table */ @@ -71,13 +71,13 @@ public: JSHTMLBRElementConstructor(ExecState* exec) : DOMObject(JSHTMLBRElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLBRElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLBRElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -106,9 +106,9 @@ static const HashTable JSHTMLBRElementPrototypeTable = const ClassInfo JSHTMLBRElementPrototype::s_info = { "HTMLBRElementPrototype", 0, &JSHTMLBRElementPrototypeTable, 0 }; -JSObject* JSHTMLBRElementPrototype::self(ExecState* exec) +JSObject* JSHTMLBRElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLBRElement>(exec); + return getDOMPrototype<JSHTMLBRElement>(exec, globalObject); } const ClassInfo JSHTMLBRElement::s_info = { "HTMLBRElement", &JSHTMLElement::s_info, &JSHTMLBRElementTable, 0 }; @@ -118,9 +118,9 @@ JSHTMLBRElement::JSHTMLBRElement(PassRefPtr<Structure> structure, PassRefPtr<HTM { } -JSObject* JSHTMLBRElement::createPrototype(ExecState* exec) +JSObject* JSHTMLBRElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLBRElementPrototype(JSHTMLBRElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLBRElementPrototype(JSHTMLBRElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLBRElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,28 +128,29 @@ bool JSHTMLBRElement::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSHTMLBRElement, Base>(exec, &JSHTMLBRElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLBRElementClear(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBRElementClear(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLBRElement* imp = static_cast<HTMLBRElement*>(static_cast<JSHTMLBRElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->clear()); } -JSValuePtr jsHTMLBRElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBRElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLBRElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLBRElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLBRElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLBRElement, Base>(exec, propertyName, value, &JSHTMLBRElementTable, this, slot); } -void setJSHTMLBRElementClear(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLBRElementClear(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBRElement* imp = static_cast<HTMLBRElement*>(static_cast<JSHTMLBRElement*>(thisObject)->impl()); imp->setClear(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLBRElement::getConstructor(ExecState* exec) +JSValue JSHTMLBRElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLBRElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBRElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLBRElement.h index 1dc4026a25..3352cb7aec 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBRElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBRElement.h @@ -31,24 +31,25 @@ class JSHTMLBRElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLBRElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLBRElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLBRElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLBRElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,9 +57,9 @@ public: // Attributes -JSC::JSValuePtr jsHTMLBRElementClear(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLBRElementClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLBRElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLBRElementClear(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLBRElementClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLBRElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseElement.cpp index 1b35657ad6..9867a20160 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLBaseElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLBaseElement); /* Hash table */ @@ -72,13 +72,13 @@ public: JSHTMLBaseElementConstructor(ExecState* exec) : DOMObject(JSHTMLBaseElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLBaseElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLBaseElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -107,9 +107,9 @@ static const HashTable JSHTMLBaseElementPrototypeTable = const ClassInfo JSHTMLBaseElementPrototype::s_info = { "HTMLBaseElementPrototype", 0, &JSHTMLBaseElementPrototypeTable, 0 }; -JSObject* JSHTMLBaseElementPrototype::self(ExecState* exec) +JSObject* JSHTMLBaseElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLBaseElement>(exec); + return getDOMPrototype<JSHTMLBaseElement>(exec, globalObject); } const ClassInfo JSHTMLBaseElement::s_info = { "HTMLBaseElement", &JSHTMLElement::s_info, &JSHTMLBaseElementTable, 0 }; @@ -119,9 +119,9 @@ JSHTMLBaseElement::JSHTMLBaseElement(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSHTMLBaseElement::createPrototype(ExecState* exec) +JSObject* JSHTMLBaseElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLBaseElementPrototype(JSHTMLBaseElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLBaseElementPrototype(JSHTMLBaseElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLBaseElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -129,40 +129,42 @@ bool JSHTMLBaseElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSHTMLBaseElement, Base>(exec, &JSHTMLBaseElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLBaseElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBaseElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLBaseElement* imp = static_cast<HTMLBaseElement*>(static_cast<JSHTMLBaseElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->href()); } -JSValuePtr jsHTMLBaseElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBaseElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLBaseElement* imp = static_cast<HTMLBaseElement*>(static_cast<JSHTMLBaseElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->target()); } -JSValuePtr jsHTMLBaseElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBaseElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLBaseElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLBaseElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLBaseElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLBaseElement, Base>(exec, propertyName, value, &JSHTMLBaseElementTable, this, slot); } -void setJSHTMLBaseElementHref(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLBaseElementHref(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBaseElement* imp = static_cast<HTMLBaseElement*>(static_cast<JSHTMLBaseElement*>(thisObject)->impl()); imp->setHref(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLBaseElementTarget(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLBaseElementTarget(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBaseElement* imp = static_cast<HTMLBaseElement*>(static_cast<JSHTMLBaseElement*>(thisObject)->impl()); imp->setTarget(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLBaseElement::getConstructor(ExecState* exec) +JSValue JSHTMLBaseElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLBaseElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseElement.h index 8c5482e521..8fdbe06937 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseElement.h @@ -31,24 +31,25 @@ class JSHTMLBaseElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLBaseElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLBaseElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLBaseElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLBaseElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,11 +57,11 @@ public: // Attributes -JSC::JSValuePtr jsHTMLBaseElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLBaseElementHref(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLBaseElementTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLBaseElementTarget(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLBaseElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLBaseElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLBaseElementHref(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLBaseElementTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLBaseElementTarget(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLBaseElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseFontElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseFontElement.cpp index d942d86aba..aef713ef45 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseFontElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseFontElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLBaseFontElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLBaseFontElement); /* Hash table */ @@ -73,13 +73,13 @@ public: JSHTMLBaseFontElementConstructor(ExecState* exec) : DOMObject(JSHTMLBaseFontElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLBaseFontElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLBaseFontElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -108,9 +108,9 @@ static const HashTable JSHTMLBaseFontElementPrototypeTable = const ClassInfo JSHTMLBaseFontElementPrototype::s_info = { "HTMLBaseFontElementPrototype", 0, &JSHTMLBaseFontElementPrototypeTable, 0 }; -JSObject* JSHTMLBaseFontElementPrototype::self(ExecState* exec) +JSObject* JSHTMLBaseFontElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLBaseFontElement>(exec); + return getDOMPrototype<JSHTMLBaseFontElement>(exec, globalObject); } const ClassInfo JSHTMLBaseFontElement::s_info = { "HTMLBaseFontElement", &JSHTMLElement::s_info, &JSHTMLBaseFontElementTable, 0 }; @@ -120,9 +120,9 @@ JSHTMLBaseFontElement::JSHTMLBaseFontElement(PassRefPtr<Structure> structure, Pa { } -JSObject* JSHTMLBaseFontElement::createPrototype(ExecState* exec) +JSObject* JSHTMLBaseFontElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLBaseFontElementPrototype(JSHTMLBaseFontElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLBaseFontElementPrototype(JSHTMLBaseFontElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLBaseFontElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -130,52 +130,55 @@ bool JSHTMLBaseFontElement::getOwnPropertySlot(ExecState* exec, const Identifier return getStaticValueSlot<JSHTMLBaseFontElement, Base>(exec, &JSHTMLBaseFontElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLBaseFontElementColor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBaseFontElementColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLBaseFontElement* imp = static_cast<HTMLBaseFontElement*>(static_cast<JSHTMLBaseFontElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->color()); } -JSValuePtr jsHTMLBaseFontElementFace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBaseFontElementFace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLBaseFontElement* imp = static_cast<HTMLBaseFontElement*>(static_cast<JSHTMLBaseFontElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->face()); } -JSValuePtr jsHTMLBaseFontElementSize(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBaseFontElementSize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLBaseFontElement* imp = static_cast<HTMLBaseFontElement*>(static_cast<JSHTMLBaseFontElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->size()); } -JSValuePtr jsHTMLBaseFontElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBaseFontElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLBaseFontElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLBaseFontElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLBaseFontElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLBaseFontElement, Base>(exec, propertyName, value, &JSHTMLBaseFontElementTable, this, slot); } -void setJSHTMLBaseFontElementColor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLBaseFontElementColor(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBaseFontElement* imp = static_cast<HTMLBaseFontElement*>(static_cast<JSHTMLBaseFontElement*>(thisObject)->impl()); imp->setColor(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLBaseFontElementFace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLBaseFontElementFace(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBaseFontElement* imp = static_cast<HTMLBaseFontElement*>(static_cast<JSHTMLBaseFontElement*>(thisObject)->impl()); imp->setFace(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLBaseFontElementSize(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLBaseFontElementSize(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBaseFontElement* imp = static_cast<HTMLBaseFontElement*>(static_cast<JSHTMLBaseFontElement*>(thisObject)->impl()); - imp->setSize(value->toInt32(exec)); + imp->setSize(value.toInt32(exec)); } -JSValuePtr JSHTMLBaseFontElement::getConstructor(ExecState* exec) +JSValue JSHTMLBaseFontElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLBaseFontElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseFontElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseFontElement.h index d09fc2b36b..534bb8082b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseFontElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseFontElement.h @@ -31,24 +31,25 @@ class JSHTMLBaseFontElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLBaseFontElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLBaseFontElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLBaseFontElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLBaseFontElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,13 +57,13 @@ public: // Attributes -JSC::JSValuePtr jsHTMLBaseFontElementColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLBaseFontElementColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLBaseFontElementFace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLBaseFontElementFace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLBaseFontElementSize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLBaseFontElementSize(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLBaseFontElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLBaseFontElementColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLBaseFontElementColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLBaseFontElementFace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLBaseFontElementFace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLBaseFontElementSize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLBaseFontElementSize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLBaseFontElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBlockquoteElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLBlockquoteElement.cpp index 7f982aacf1..590ebe7e1b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBlockquoteElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBlockquoteElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLBlockquoteElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLBlockquoteElement); /* Hash table */ @@ -71,13 +71,13 @@ public: JSHTMLBlockquoteElementConstructor(ExecState* exec) : DOMObject(JSHTMLBlockquoteElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLBlockquoteElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLBlockquoteElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -106,9 +106,9 @@ static const HashTable JSHTMLBlockquoteElementPrototypeTable = const ClassInfo JSHTMLBlockquoteElementPrototype::s_info = { "HTMLBlockquoteElementPrototype", 0, &JSHTMLBlockquoteElementPrototypeTable, 0 }; -JSObject* JSHTMLBlockquoteElementPrototype::self(ExecState* exec) +JSObject* JSHTMLBlockquoteElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLBlockquoteElement>(exec); + return getDOMPrototype<JSHTMLBlockquoteElement>(exec, globalObject); } const ClassInfo JSHTMLBlockquoteElement::s_info = { "HTMLBlockquoteElement", &JSHTMLElement::s_info, &JSHTMLBlockquoteElementTable, 0 }; @@ -118,9 +118,9 @@ JSHTMLBlockquoteElement::JSHTMLBlockquoteElement(PassRefPtr<Structure> structure { } -JSObject* JSHTMLBlockquoteElement::createPrototype(ExecState* exec) +JSObject* JSHTMLBlockquoteElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLBlockquoteElementPrototype(JSHTMLBlockquoteElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLBlockquoteElementPrototype(JSHTMLBlockquoteElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLBlockquoteElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,28 +128,29 @@ bool JSHTMLBlockquoteElement::getOwnPropertySlot(ExecState* exec, const Identifi return getStaticValueSlot<JSHTMLBlockquoteElement, Base>(exec, &JSHTMLBlockquoteElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLBlockquoteElementCite(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBlockquoteElementCite(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLBlockquoteElement* imp = static_cast<HTMLBlockquoteElement*>(static_cast<JSHTMLBlockquoteElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->cite()); } -JSValuePtr jsHTMLBlockquoteElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBlockquoteElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLBlockquoteElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLBlockquoteElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLBlockquoteElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLBlockquoteElement, Base>(exec, propertyName, value, &JSHTMLBlockquoteElementTable, this, slot); } -void setJSHTMLBlockquoteElementCite(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLBlockquoteElementCite(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBlockquoteElement* imp = static_cast<HTMLBlockquoteElement*>(static_cast<JSHTMLBlockquoteElement*>(thisObject)->impl()); imp->setCite(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLBlockquoteElement::getConstructor(ExecState* exec) +JSValue JSHTMLBlockquoteElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLBlockquoteElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBlockquoteElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLBlockquoteElement.h index 86bf06bed2..7949bddba2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBlockquoteElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBlockquoteElement.h @@ -31,24 +31,25 @@ class JSHTMLBlockquoteElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLBlockquoteElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLBlockquoteElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLBlockquoteElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLBlockquoteElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,9 +57,9 @@ public: // Attributes -JSC::JSValuePtr jsHTMLBlockquoteElementCite(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLBlockquoteElementCite(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLBlockquoteElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLBlockquoteElementCite(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLBlockquoteElementCite(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLBlockquoteElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBodyElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLBodyElement.cpp index c68d2ac6ce..27596432e3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBodyElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBodyElement.cpp @@ -34,11 +34,11 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLBodyElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLBodyElement); /* Hash table */ -static const HashTableValue JSHTMLBodyElementTableValues[12] = +static const HashTableValue JSHTMLBodyElementTableValues[8] = { { "aLink", DontDelete, (intptr_t)jsHTMLBodyElementALink, (intptr_t)setJSHTMLBodyElementALink }, { "background", DontDelete, (intptr_t)jsHTMLBodyElementBackground, (intptr_t)setJSHTMLBodyElementBackground }, @@ -46,19 +46,15 @@ static const HashTableValue JSHTMLBodyElementTableValues[12] = { "link", DontDelete, (intptr_t)jsHTMLBodyElementLink, (intptr_t)setJSHTMLBodyElementLink }, { "text", DontDelete, (intptr_t)jsHTMLBodyElementText, (intptr_t)setJSHTMLBodyElementText }, { "vLink", DontDelete, (intptr_t)jsHTMLBodyElementVLink, (intptr_t)setJSHTMLBodyElementVLink }, - { "scrollLeft", DontDelete, (intptr_t)jsHTMLBodyElementScrollLeft, (intptr_t)setJSHTMLBodyElementScrollLeft }, - { "scrollTop", DontDelete, (intptr_t)jsHTMLBodyElementScrollTop, (intptr_t)setJSHTMLBodyElementScrollTop }, - { "scrollWidth", DontDelete|ReadOnly, (intptr_t)jsHTMLBodyElementScrollWidth, (intptr_t)0 }, - { "scrollHeight", DontDelete|ReadOnly, (intptr_t)jsHTMLBodyElementScrollHeight, (intptr_t)0 }, { "constructor", DontEnum|ReadOnly, (intptr_t)jsHTMLBodyElementConstructor, (intptr_t)0 }, { 0, 0, 0, 0 } }; static const HashTable JSHTMLBodyElementTable = #if ENABLE(PERFECT_HASH_SIZE) - { 63, JSHTMLBodyElementTableValues, 0 }; + { 31, JSHTMLBodyElementTableValues, 0 }; #else - { 33, 31, JSHTMLBodyElementTableValues, 0 }; + { 17, 15, JSHTMLBodyElementTableValues, 0 }; #endif /* Hash table for constructor */ @@ -80,13 +76,13 @@ public: JSHTMLBodyElementConstructor(ExecState* exec) : DOMObject(JSHTMLBodyElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLBodyElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLBodyElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -115,9 +111,9 @@ static const HashTable JSHTMLBodyElementPrototypeTable = const ClassInfo JSHTMLBodyElementPrototype::s_info = { "HTMLBodyElementPrototype", 0, &JSHTMLBodyElementPrototypeTable, 0 }; -JSObject* JSHTMLBodyElementPrototype::self(ExecState* exec) +JSObject* JSHTMLBodyElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLBodyElement>(exec); + return getDOMPrototype<JSHTMLBodyElement>(exec, globalObject); } const ClassInfo JSHTMLBodyElement::s_info = { "HTMLBodyElement", &JSHTMLElement::s_info, &JSHTMLBodyElementTable, 0 }; @@ -127,9 +123,9 @@ JSHTMLBodyElement::JSHTMLBodyElement(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSHTMLBodyElement::createPrototype(ExecState* exec) +JSObject* JSHTMLBodyElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLBodyElementPrototype(JSHTMLBodyElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLBodyElementPrototype(JSHTMLBodyElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLBodyElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -137,124 +133,94 @@ bool JSHTMLBodyElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSHTMLBodyElement, Base>(exec, &JSHTMLBodyElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLBodyElementALink(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBodyElementALink(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->aLink()); } -JSValuePtr jsHTMLBodyElementBackground(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBodyElementBackground(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->background()); } -JSValuePtr jsHTMLBodyElementBgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBodyElementBgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->bgColor()); } -JSValuePtr jsHTMLBodyElementLink(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBodyElementLink(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->link()); } -JSValuePtr jsHTMLBodyElementText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBodyElementText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->text()); } -JSValuePtr jsHTMLBodyElementVLink(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBodyElementVLink(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->vLink()); } -JSValuePtr jsHTMLBodyElementScrollLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->scrollLeft()); -} - -JSValuePtr jsHTMLBodyElementScrollTop(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->scrollTop()); -} - -JSValuePtr jsHTMLBodyElementScrollWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->scrollWidth()); -} - -JSValuePtr jsHTMLBodyElementScrollHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->scrollHeight()); -} - -JSValuePtr jsHTMLBodyElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLBodyElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLBodyElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLBodyElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLBodyElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLBodyElement, Base>(exec, propertyName, value, &JSHTMLBodyElementTable, this, slot); } -void setJSHTMLBodyElementALink(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLBodyElementALink(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(thisObject)->impl()); imp->setALink(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLBodyElementBackground(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLBodyElementBackground(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(thisObject)->impl()); imp->setBackground(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLBodyElementBgColor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLBodyElementBgColor(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(thisObject)->impl()); imp->setBgColor(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLBodyElementLink(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLBodyElementLink(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(thisObject)->impl()); imp->setLink(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLBodyElementText(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLBodyElementText(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(thisObject)->impl()); imp->setText(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLBodyElementVLink(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLBodyElementVLink(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(thisObject)->impl()); imp->setVLink(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLBodyElementScrollLeft(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(thisObject)->impl()); - imp->setScrollLeft(value->toInt32(exec)); -} - -void setJSHTMLBodyElementScrollTop(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(static_cast<JSHTMLBodyElement*>(thisObject)->impl()); - imp->setScrollTop(value->toInt32(exec)); -} - -JSValuePtr JSHTMLBodyElement::getConstructor(ExecState* exec) +JSValue JSHTMLBodyElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLBodyElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBodyElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLBodyElement.h index 784bf79e47..b0a635d3ba 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBodyElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBodyElement.h @@ -31,24 +31,25 @@ class JSHTMLBodyElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLBodyElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLBodyElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLBodyElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLBodyElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,25 +57,19 @@ public: // Attributes -JSC::JSValuePtr jsHTMLBodyElementALink(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLBodyElementALink(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLBodyElementBackground(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLBodyElementBackground(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLBodyElementBgColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLBodyElementBgColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLBodyElementLink(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLBodyElementLink(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLBodyElementText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLBodyElementText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLBodyElementVLink(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLBodyElementVLink(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLBodyElementScrollLeft(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLBodyElementScrollLeft(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLBodyElementScrollTop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLBodyElementScrollTop(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLBodyElementScrollWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLBodyElementScrollHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLBodyElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLBodyElementALink(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLBodyElementALink(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLBodyElementBackground(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLBodyElementBackground(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLBodyElementBgColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLBodyElementBgColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLBodyElementLink(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLBodyElementLink(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLBodyElementText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLBodyElementText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLBodyElementVLink(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLBodyElementVLink(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLBodyElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLButtonElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLButtonElement.cpp index eea3361ad4..22a2479fa3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLButtonElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLButtonElement.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLButtonElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLButtonElement); /* Hash table */ @@ -81,13 +81,13 @@ public: JSHTMLButtonElementConstructor(ExecState* exec) : DOMObject(JSHTMLButtonElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLButtonElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLButtonElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -117,9 +117,9 @@ static const HashTable JSHTMLButtonElementPrototypeTable = const ClassInfo JSHTMLButtonElementPrototype::s_info = { "HTMLButtonElementPrototype", 0, &JSHTMLButtonElementPrototypeTable, 0 }; -JSObject* JSHTMLButtonElementPrototype::self(ExecState* exec) +JSObject* JSHTMLButtonElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLButtonElement>(exec); + return getDOMPrototype<JSHTMLButtonElement>(exec, globalObject); } bool JSHTMLButtonElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -134,9 +134,9 @@ JSHTMLButtonElement::JSHTMLButtonElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSHTMLButtonElement::createPrototype(ExecState* exec) +JSObject* JSHTMLButtonElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLButtonElementPrototype(JSHTMLButtonElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLButtonElementPrototype(JSHTMLButtonElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLButtonElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -144,101 +144,110 @@ bool JSHTMLButtonElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSHTMLButtonElement, Base>(exec, &JSHTMLButtonElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLButtonElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLButtonElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLButtonElement* imp = static_cast<HTMLButtonElement*>(static_cast<JSHTMLButtonElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->form())); } -JSValuePtr jsHTMLButtonElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLButtonElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLButtonElement* imp = static_cast<HTMLButtonElement*>(static_cast<JSHTMLButtonElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->accessKey()); } -JSValuePtr jsHTMLButtonElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLButtonElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLButtonElement* imp = static_cast<HTMLButtonElement*>(static_cast<JSHTMLButtonElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->disabled()); } -JSValuePtr jsHTMLButtonElementAutofocus(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLButtonElementAutofocus(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLButtonElement* imp = static_cast<HTMLButtonElement*>(static_cast<JSHTMLButtonElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->autofocus()); } -JSValuePtr jsHTMLButtonElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLButtonElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLButtonElement* imp = static_cast<HTMLButtonElement*>(static_cast<JSHTMLButtonElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsHTMLButtonElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLButtonElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLButtonElement* imp = static_cast<HTMLButtonElement*>(static_cast<JSHTMLButtonElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsHTMLButtonElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLButtonElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLButtonElement* imp = static_cast<HTMLButtonElement*>(static_cast<JSHTMLButtonElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->value()); } -JSValuePtr jsHTMLButtonElementWillValidate(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLButtonElementWillValidate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLButtonElement* imp = static_cast<HTMLButtonElement*>(static_cast<JSHTMLButtonElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->willValidate()); } -JSValuePtr jsHTMLButtonElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLButtonElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLButtonElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLButtonElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLButtonElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLButtonElement, Base>(exec, propertyName, value, &JSHTMLButtonElementTable, this, slot); } -void setJSHTMLButtonElementAccessKey(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLButtonElementAccessKey(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLButtonElement* imp = static_cast<HTMLButtonElement*>(static_cast<JSHTMLButtonElement*>(thisObject)->impl()); imp->setAccessKey(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLButtonElementDisabled(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLButtonElementDisabled(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLButtonElement* imp = static_cast<HTMLButtonElement*>(static_cast<JSHTMLButtonElement*>(thisObject)->impl()); - imp->setDisabled(value->toBoolean(exec)); + imp->setDisabled(value.toBoolean(exec)); } -void setJSHTMLButtonElementAutofocus(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLButtonElementAutofocus(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLButtonElement* imp = static_cast<HTMLButtonElement*>(static_cast<JSHTMLButtonElement*>(thisObject)->impl()); - imp->setAutofocus(value->toBoolean(exec)); + imp->setAutofocus(value.toBoolean(exec)); } -void setJSHTMLButtonElementName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLButtonElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLButtonElement* imp = static_cast<HTMLButtonElement*>(static_cast<JSHTMLButtonElement*>(thisObject)->impl()); imp->setName(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLButtonElementValue(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLButtonElementValue(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLButtonElement* imp = static_cast<HTMLButtonElement*>(static_cast<JSHTMLButtonElement*>(thisObject)->impl()); imp->setValue(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLButtonElement::getConstructor(ExecState* exec) +JSValue JSHTMLButtonElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLButtonElementConstructor>(exec); } -JSValuePtr jsHTMLButtonElementPrototypeFunctionClick(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLButtonElementPrototypeFunctionClick(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLButtonElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLButtonElement::s_info)) return throwError(exec, TypeError); JSHTMLButtonElement* castedThisObj = static_cast<JSHTMLButtonElement*>(asObject(thisValue)); HTMLButtonElement* imp = static_cast<HTMLButtonElement*>(castedThisObj->impl()); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLButtonElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLButtonElement.h index 85f734171b..9849bbb979 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLButtonElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLButtonElement.h @@ -31,28 +31,29 @@ class JSHTMLButtonElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLButtonElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLButtonElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLButtonElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -61,23 +62,23 @@ public: // Functions -JSC::JSValuePtr jsHTMLButtonElementPrototypeFunctionClick(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLButtonElementPrototypeFunctionClick(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLButtonElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLButtonElementAccessKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLButtonElementAccessKey(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLButtonElementDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLButtonElementDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLButtonElementAutofocus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLButtonElementAutofocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLButtonElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLButtonElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLButtonElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLButtonElementValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLButtonElementValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLButtonElementWillValidate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLButtonElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLButtonElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLButtonElementAccessKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLButtonElementAccessKey(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLButtonElementDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLButtonElementDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLButtonElementAutofocus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLButtonElementAutofocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLButtonElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLButtonElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLButtonElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLButtonElementValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLButtonElementValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLButtonElementWillValidate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLButtonElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLCanvasElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLCanvasElement.cpp index eee52cc835..82835edc7b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLCanvasElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLCanvasElement.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLCanvasElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLCanvasElement); /* Hash table */ @@ -74,13 +74,13 @@ public: JSHTMLCanvasElementConstructor(ExecState* exec) : DOMObject(JSHTMLCanvasElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLCanvasElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLCanvasElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -111,9 +111,9 @@ static const HashTable JSHTMLCanvasElementPrototypeTable = const ClassInfo JSHTMLCanvasElementPrototype::s_info = { "HTMLCanvasElementPrototype", 0, &JSHTMLCanvasElementPrototypeTable, 0 }; -JSObject* JSHTMLCanvasElementPrototype::self(ExecState* exec) +JSObject* JSHTMLCanvasElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLCanvasElement>(exec); + return getDOMPrototype<JSHTMLCanvasElement>(exec, globalObject); } bool JSHTMLCanvasElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,9 +128,9 @@ JSHTMLCanvasElement::JSHTMLCanvasElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSHTMLCanvasElement::createPrototype(ExecState* exec) +JSObject* JSHTMLCanvasElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLCanvasElementPrototype(JSHTMLCanvasElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLCanvasElementPrototype(JSHTMLCanvasElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLCanvasElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -138,69 +138,73 @@ bool JSHTMLCanvasElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSHTMLCanvasElement, Base>(exec, &JSHTMLCanvasElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLCanvasElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLCanvasElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLCanvasElement* imp = static_cast<HTMLCanvasElement*>(static_cast<JSHTMLCanvasElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->width()); } -JSValuePtr jsHTMLCanvasElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLCanvasElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLCanvasElement* imp = static_cast<HTMLCanvasElement*>(static_cast<JSHTMLCanvasElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->height()); } -JSValuePtr jsHTMLCanvasElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLCanvasElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLCanvasElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLCanvasElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLCanvasElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLCanvasElement, Base>(exec, propertyName, value, &JSHTMLCanvasElementTable, this, slot); } -void setJSHTMLCanvasElementWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLCanvasElementWidth(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLCanvasElement* imp = static_cast<HTMLCanvasElement*>(static_cast<JSHTMLCanvasElement*>(thisObject)->impl()); - imp->setWidth(value->toInt32(exec)); + imp->setWidth(value.toInt32(exec)); } -void setJSHTMLCanvasElementHeight(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLCanvasElementHeight(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLCanvasElement* imp = static_cast<HTMLCanvasElement*>(static_cast<JSHTMLCanvasElement*>(thisObject)->impl()); - imp->setHeight(value->toInt32(exec)); + imp->setHeight(value.toInt32(exec)); } -JSValuePtr JSHTMLCanvasElement::getConstructor(ExecState* exec) +JSValue JSHTMLCanvasElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLCanvasElementConstructor>(exec); } -JSValuePtr jsHTMLCanvasElementPrototypeFunctionToDataURL(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLCanvasElementPrototypeFunctionToDataURL(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLCanvasElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLCanvasElement::s_info)) return throwError(exec, TypeError); JSHTMLCanvasElement* castedThisObj = static_cast<JSHTMLCanvasElement*>(asObject(thisValue)); HTMLCanvasElement* imp = static_cast<HTMLCanvasElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& type = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 0)); + const UString& type = valueToStringWithUndefinedOrNullCheck(exec, args.at(0)); - JSC::JSValuePtr result = jsString(exec, imp->toDataURL(type, ec)); + JSC::JSValue result = jsString(exec, imp->toDataURL(type, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsHTMLCanvasElementPrototypeFunctionGetContext(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLCanvasElementPrototypeFunctionGetContext(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLCanvasElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLCanvasElement::s_info)) return throwError(exec, TypeError); JSHTMLCanvasElement* castedThisObj = static_cast<JSHTMLCanvasElement*>(asObject(thisValue)); HTMLCanvasElement* imp = static_cast<HTMLCanvasElement*>(castedThisObj->impl()); - const UString& contextId = args.at(exec, 0)->toString(exec); + const UString& contextId = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getContext(contextId))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getContext(contextId))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLCanvasElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLCanvasElement.h index 4c48d20d81..ad41d15267 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLCanvasElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLCanvasElement.h @@ -31,28 +31,29 @@ class JSHTMLCanvasElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLCanvasElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLCanvasElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLCanvasElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -61,15 +62,15 @@ public: // Functions -JSC::JSValuePtr jsHTMLCanvasElementPrototypeFunctionToDataURL(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLCanvasElementPrototypeFunctionGetContext(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLCanvasElementPrototypeFunctionToDataURL(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLCanvasElementPrototypeFunctionGetContext(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLCanvasElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLCanvasElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLCanvasElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLCanvasElementHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLCanvasElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLCanvasElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLCanvasElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLCanvasElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLCanvasElementHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLCanvasElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLCollection.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLCollection.cpp index 1888e46262..3d2f98a87d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLCollection.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLCollection.cpp @@ -40,7 +40,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLCollection) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLCollection); /* Hash table */ @@ -77,13 +77,13 @@ public: JSHTMLCollectionConstructor(ExecState* exec) : DOMObject(JSHTMLCollectionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLCollectionPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLCollectionPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -115,9 +115,9 @@ static const HashTable JSHTMLCollectionPrototypeTable = const ClassInfo JSHTMLCollectionPrototype::s_info = { "HTMLCollectionPrototype", 0, &JSHTMLCollectionPrototypeTable, 0 }; -JSObject* JSHTMLCollectionPrototype::self(ExecState* exec) +JSObject* JSHTMLCollectionPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLCollection>(exec); + return getDOMPrototype<JSHTMLCollection>(exec, globalObject); } bool JSHTMLCollectionPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -136,18 +136,17 @@ JSHTMLCollection::JSHTMLCollection(PassRefPtr<Structure> structure, PassRefPtr<H JSHTMLCollection::~JSHTMLCollection() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSHTMLCollection::createPrototype(ExecState* exec) +JSObject* JSHTMLCollection::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLCollectionPrototype(JSHTMLCollectionPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSHTMLCollectionPrototype(JSHTMLCollectionPrototype::createStructure(globalObject->objectPrototype())); } bool JSHTMLCollection::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { - JSValuePtr proto = prototype(); - if (proto->isObject() && static_cast<JSObject*>(asObject(proto))->hasProperty(exec, propertyName)) + JSValue proto = prototype(); + if (proto.isObject() && static_cast<JSObject*>(asObject(proto))->hasProperty(exec, propertyName)) return false; const HashEntry* entry = JSHTMLCollectionTable.entry(exec, propertyName); @@ -177,13 +176,14 @@ bool JSHTMLCollection::getOwnPropertySlot(ExecState* exec, unsigned propertyName return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -JSValuePtr jsHTMLCollectionLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLCollectionLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLCollection* imp = static_cast<HTMLCollection*>(static_cast<JSHTMLCollection*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsHTMLCollectionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLCollectionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLCollection*>(asObject(slot.slotBase()))->getConstructor(exec); } @@ -194,49 +194,52 @@ void JSHTMLCollection::getPropertyNames(ExecState* exec, PropertyNameArray& prop Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSHTMLCollection::getConstructor(ExecState* exec) +JSValue JSHTMLCollection::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLCollectionConstructor>(exec); } -JSValuePtr jsHTMLCollectionPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLCollectionPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLCollection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLCollection::s_info)) return throwError(exec, TypeError); JSHTMLCollection* castedThisObj = static_cast<JSHTMLCollection*>(asObject(thisValue)); return castedThisObj->item(exec, args); } -JSValuePtr jsHTMLCollectionPrototypeFunctionNamedItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLCollectionPrototypeFunctionNamedItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLCollection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLCollection::s_info)) return throwError(exec, TypeError); JSHTMLCollection* castedThisObj = static_cast<JSHTMLCollection*>(asObject(thisValue)); return castedThisObj->namedItem(exec, args); } -JSValuePtr jsHTMLCollectionPrototypeFunctionTags(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLCollectionPrototypeFunctionTags(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLCollection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLCollection::s_info)) return throwError(exec, TypeError); JSHTMLCollection* castedThisObj = static_cast<JSHTMLCollection*>(asObject(thisValue)); HTMLCollection* imp = static_cast<HTMLCollection*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->tags(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->tags(name))); return result; } -JSValuePtr JSHTMLCollection::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue JSHTMLCollection::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSHTMLCollection* thisObj = static_cast<JSHTMLCollection*>(asObject(slot.slotBase())); return toJS(exec, static_cast<HTMLCollection*>(thisObj->impl())->item(slot.index())); } -HTMLCollection* toHTMLCollection(JSC::JSValuePtr value) +HTMLCollection* toHTMLCollection(JSC::JSValue value) { - return value->isObject(&JSHTMLCollection::s_info) ? static_cast<JSHTMLCollection*>(asObject(value))->impl() : 0; + return value.isObject(&JSHTMLCollection::s_info) ? static_cast<JSHTMLCollection*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLCollection.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLCollection.h index 2ec3824977..f88b6b4cf1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLCollection.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLCollection.h @@ -35,13 +35,13 @@ class JSHTMLCollection : public DOMObject { public: JSHTMLCollection(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLCollection>); virtual ~JSHTMLCollection(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,31 +49,32 @@ public: virtual JSC::CallType getCallData(JSC::CallData&); virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom functions - JSC::JSValuePtr item(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr namedItem(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue item(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue namedItem(JSC::ExecState*, const JSC::ArgList&); HTMLCollection* impl() const { return m_impl.get(); } private: RefPtr<HTMLCollection> m_impl; - static JSC::JSValuePtr indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); private: static bool canGetItemsForName(JSC::ExecState*, HTMLCollection*, const JSC::Identifier&); - static JSC::JSValuePtr nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValuePtr toJS(JSC::ExecState*, HTMLCollection*); -HTMLCollection* toHTMLCollection(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, HTMLCollection*); +HTMLCollection* toHTMLCollection(JSC::JSValue); class JSHTMLCollectionPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -82,13 +83,13 @@ public: // Functions -JSC::JSValuePtr jsHTMLCollectionPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLCollectionPrototypeFunctionNamedItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLCollectionPrototypeFunctionTags(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLCollectionPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLCollectionPrototypeFunctionNamedItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLCollectionPrototypeFunctionTags(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLCollectionLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLCollectionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLCollectionLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLCollectionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDListElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLDListElement.cpp index 0d9c9aa188..1cdc097dbc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDListElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDListElement.cpp @@ -32,7 +32,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLDListElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLDListElement); /* Hash table */ @@ -69,13 +69,13 @@ public: JSHTMLDListElementConstructor(ExecState* exec) : DOMObject(JSHTMLDListElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLDListElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLDListElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -104,9 +104,9 @@ static const HashTable JSHTMLDListElementPrototypeTable = const ClassInfo JSHTMLDListElementPrototype::s_info = { "HTMLDListElementPrototype", 0, &JSHTMLDListElementPrototypeTable, 0 }; -JSObject* JSHTMLDListElementPrototype::self(ExecState* exec) +JSObject* JSHTMLDListElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLDListElement>(exec); + return getDOMPrototype<JSHTMLDListElement>(exec, globalObject); } const ClassInfo JSHTMLDListElement::s_info = { "HTMLDListElement", &JSHTMLElement::s_info, &JSHTMLDListElementTable, 0 }; @@ -116,9 +116,9 @@ JSHTMLDListElement::JSHTMLDListElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSHTMLDListElement::createPrototype(ExecState* exec) +JSObject* JSHTMLDListElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLDListElementPrototype(JSHTMLDListElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLDListElementPrototype(JSHTMLDListElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLDListElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -126,28 +126,29 @@ bool JSHTMLDListElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSHTMLDListElement, Base>(exec, &JSHTMLDListElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLDListElementCompact(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDListElementCompact(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDListElement* imp = static_cast<HTMLDListElement*>(static_cast<JSHTMLDListElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->compact()); } -JSValuePtr jsHTMLDListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLDListElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLDListElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLDListElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLDListElement, Base>(exec, propertyName, value, &JSHTMLDListElementTable, this, slot); } -void setJSHTMLDListElementCompact(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLDListElementCompact(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLDListElement* imp = static_cast<HTMLDListElement*>(static_cast<JSHTMLDListElement*>(thisObject)->impl()); - imp->setCompact(value->toBoolean(exec)); + imp->setCompact(value.toBoolean(exec)); } -JSValuePtr JSHTMLDListElement::getConstructor(ExecState* exec) +JSValue JSHTMLDListElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLDListElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDListElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLDListElement.h index 9efceb325c..a1519ebcda 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDListElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDListElement.h @@ -31,24 +31,25 @@ class JSHTMLDListElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLDListElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLDListElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLDListElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLDListElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,9 +57,9 @@ public: // Attributes -JSC::JSValuePtr jsHTMLDListElementCompact(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLDListElementCompact(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLDListElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLDListElementCompact(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLDListElementCompact(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLDListElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDirectoryElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLDirectoryElement.cpp index 6a69c32f95..42e0449a4e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDirectoryElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDirectoryElement.cpp @@ -32,7 +32,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLDirectoryElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLDirectoryElement); /* Hash table */ @@ -69,13 +69,13 @@ public: JSHTMLDirectoryElementConstructor(ExecState* exec) : DOMObject(JSHTMLDirectoryElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLDirectoryElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLDirectoryElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -104,9 +104,9 @@ static const HashTable JSHTMLDirectoryElementPrototypeTable = const ClassInfo JSHTMLDirectoryElementPrototype::s_info = { "HTMLDirectoryElementPrototype", 0, &JSHTMLDirectoryElementPrototypeTable, 0 }; -JSObject* JSHTMLDirectoryElementPrototype::self(ExecState* exec) +JSObject* JSHTMLDirectoryElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLDirectoryElement>(exec); + return getDOMPrototype<JSHTMLDirectoryElement>(exec, globalObject); } const ClassInfo JSHTMLDirectoryElement::s_info = { "HTMLDirectoryElement", &JSHTMLElement::s_info, &JSHTMLDirectoryElementTable, 0 }; @@ -116,9 +116,9 @@ JSHTMLDirectoryElement::JSHTMLDirectoryElement(PassRefPtr<Structure> structure, { } -JSObject* JSHTMLDirectoryElement::createPrototype(ExecState* exec) +JSObject* JSHTMLDirectoryElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLDirectoryElementPrototype(JSHTMLDirectoryElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLDirectoryElementPrototype(JSHTMLDirectoryElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLDirectoryElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -126,28 +126,29 @@ bool JSHTMLDirectoryElement::getOwnPropertySlot(ExecState* exec, const Identifie return getStaticValueSlot<JSHTMLDirectoryElement, Base>(exec, &JSHTMLDirectoryElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLDirectoryElementCompact(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDirectoryElementCompact(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDirectoryElement* imp = static_cast<HTMLDirectoryElement*>(static_cast<JSHTMLDirectoryElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->compact()); } -JSValuePtr jsHTMLDirectoryElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDirectoryElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLDirectoryElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLDirectoryElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLDirectoryElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLDirectoryElement, Base>(exec, propertyName, value, &JSHTMLDirectoryElementTable, this, slot); } -void setJSHTMLDirectoryElementCompact(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLDirectoryElementCompact(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLDirectoryElement* imp = static_cast<HTMLDirectoryElement*>(static_cast<JSHTMLDirectoryElement*>(thisObject)->impl()); - imp->setCompact(value->toBoolean(exec)); + imp->setCompact(value.toBoolean(exec)); } -JSValuePtr JSHTMLDirectoryElement::getConstructor(ExecState* exec) +JSValue JSHTMLDirectoryElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLDirectoryElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDirectoryElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLDirectoryElement.h index bdbe75c87f..09242bfe44 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDirectoryElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDirectoryElement.h @@ -31,24 +31,25 @@ class JSHTMLDirectoryElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLDirectoryElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLDirectoryElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLDirectoryElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLDirectoryElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,9 +57,9 @@ public: // Attributes -JSC::JSValuePtr jsHTMLDirectoryElementCompact(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLDirectoryElementCompact(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLDirectoryElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLDirectoryElementCompact(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLDirectoryElementCompact(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLDirectoryElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDivElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLDivElement.cpp index 7616fc169d..e731da979b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDivElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDivElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLDivElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLDivElement); /* Hash table */ @@ -71,13 +71,13 @@ public: JSHTMLDivElementConstructor(ExecState* exec) : DOMObject(JSHTMLDivElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLDivElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLDivElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -106,9 +106,9 @@ static const HashTable JSHTMLDivElementPrototypeTable = const ClassInfo JSHTMLDivElementPrototype::s_info = { "HTMLDivElementPrototype", 0, &JSHTMLDivElementPrototypeTable, 0 }; -JSObject* JSHTMLDivElementPrototype::self(ExecState* exec) +JSObject* JSHTMLDivElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLDivElement>(exec); + return getDOMPrototype<JSHTMLDivElement>(exec, globalObject); } const ClassInfo JSHTMLDivElement::s_info = { "HTMLDivElement", &JSHTMLElement::s_info, &JSHTMLDivElementTable, 0 }; @@ -118,9 +118,9 @@ JSHTMLDivElement::JSHTMLDivElement(PassRefPtr<Structure> structure, PassRefPtr<H { } -JSObject* JSHTMLDivElement::createPrototype(ExecState* exec) +JSObject* JSHTMLDivElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLDivElementPrototype(JSHTMLDivElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLDivElementPrototype(JSHTMLDivElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLDivElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,28 +128,29 @@ bool JSHTMLDivElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSHTMLDivElement, Base>(exec, &JSHTMLDivElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLDivElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDivElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDivElement* imp = static_cast<HTMLDivElement*>(static_cast<JSHTMLDivElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLDivElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDivElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLDivElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLDivElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLDivElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLDivElement, Base>(exec, propertyName, value, &JSHTMLDivElementTable, this, slot); } -void setJSHTMLDivElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLDivElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLDivElement* imp = static_cast<HTMLDivElement*>(static_cast<JSHTMLDivElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLDivElement::getConstructor(ExecState* exec) +JSValue JSHTMLDivElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLDivElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDivElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLDivElement.h index 412949d473..1f3545b9ca 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDivElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDivElement.h @@ -31,24 +31,25 @@ class JSHTMLDivElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLDivElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLDivElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLDivElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLDivElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,9 +57,9 @@ public: // Attributes -JSC::JSValuePtr jsHTMLDivElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLDivElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLDivElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLDivElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLDivElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLDivElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.cpp index ceca27d0b8..9dfbacd257 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.cpp @@ -40,7 +40,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLDocument) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLDocument); /* Hash table */ @@ -91,13 +91,13 @@ public: JSHTMLDocumentConstructor(ExecState* exec) : DOMObject(JSHTMLDocumentConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLDocumentPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLDocumentPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -134,9 +134,9 @@ static const HashTable JSHTMLDocumentPrototypeTable = const ClassInfo JSHTMLDocumentPrototype::s_info = { "HTMLDocumentPrototype", 0, &JSHTMLDocumentPrototypeTable, 0 }; -JSObject* JSHTMLDocumentPrototype::self(ExecState* exec) +JSObject* JSHTMLDocumentPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLDocument>(exec); + return getDOMPrototype<JSHTMLDocument>(exec, globalObject); } bool JSHTMLDocumentPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -151,9 +151,9 @@ JSHTMLDocument::JSHTMLDocument(PassRefPtr<Structure> structure, PassRefPtr<HTMLD { } -JSObject* JSHTMLDocument::createPrototype(ExecState* exec) +JSObject* JSHTMLDocument::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLDocumentPrototype(JSHTMLDocumentPrototype::createStructure(JSDocumentPrototype::self(exec))); + return new (exec) JSHTMLDocumentPrototype(JSHTMLDocumentPrototype::createStructure(JSDocumentPrototype::self(exec, globalObject))); } bool JSHTMLDocument::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -165,167 +165,183 @@ bool JSHTMLDocument::getOwnPropertySlot(ExecState* exec, const Identifier& prope return getStaticValueSlot<JSHTMLDocument, Base>(exec, &JSHTMLDocumentTable, this, propertyName, slot); } -JSValuePtr jsHTMLDocumentEmbeds(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDocumentEmbeds(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->embeds())); } -JSValuePtr jsHTMLDocumentPlugins(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDocumentPlugins(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->plugins())); } -JSValuePtr jsHTMLDocumentScripts(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDocumentScripts(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->scripts())); } -JSValuePtr jsHTMLDocumentAll(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDocumentAll(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLDocument*>(asObject(slot.slotBase()))->all(exec); } -JSValuePtr jsHTMLDocumentWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDocumentWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->width()); } -JSValuePtr jsHTMLDocumentHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDocumentHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->height()); } -JSValuePtr jsHTMLDocumentDir(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDocumentDir(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->dir()); } -JSValuePtr jsHTMLDocumentDesignMode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDocumentDesignMode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->designMode()); } -JSValuePtr jsHTMLDocumentCompatMode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDocumentCompatMode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->compatMode()); } -JSValuePtr jsHTMLDocumentActiveElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDocumentActiveElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->activeElement())); } -JSValuePtr jsHTMLDocumentBgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDocumentBgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->bgColor()); } -JSValuePtr jsHTMLDocumentFgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDocumentFgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->fgColor()); } -JSValuePtr jsHTMLDocumentAlinkColor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDocumentAlinkColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->alinkColor()); } -JSValuePtr jsHTMLDocumentLinkColor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDocumentLinkColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->linkColor()); } -JSValuePtr jsHTMLDocumentVlinkColor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDocumentVlinkColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->vlinkColor()); } -JSValuePtr jsHTMLDocumentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLDocumentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLDocument*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLDocument::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLDocument::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLDocument, Base>(exec, propertyName, value, &JSHTMLDocumentTable, this, slot); } -void setJSHTMLDocumentAll(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLDocumentAll(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSHTMLDocument*>(thisObject)->setAll(exec, value); } -void setJSHTMLDocumentDir(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLDocumentDir(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(thisObject)->impl()); imp->setDir(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLDocumentDesignMode(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLDocumentDesignMode(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(thisObject)->impl()); imp->setDesignMode(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLDocumentBgColor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLDocumentBgColor(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(thisObject)->impl()); imp->setBgColor(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLDocumentFgColor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLDocumentFgColor(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(thisObject)->impl()); imp->setFgColor(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLDocumentAlinkColor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLDocumentAlinkColor(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(thisObject)->impl()); imp->setAlinkColor(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLDocumentLinkColor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLDocumentLinkColor(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(thisObject)->impl()); imp->setLinkColor(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLDocumentVlinkColor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLDocumentVlinkColor(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLDocument* imp = static_cast<HTMLDocument*>(static_cast<JSHTMLDocument*>(thisObject)->impl()); imp->setVlinkColor(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLDocument::getConstructor(ExecState* exec) +JSValue JSHTMLDocument::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLDocumentConstructor>(exec); } -JSValuePtr jsHTMLDocumentPrototypeFunctionOpen(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionOpen(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLDocument::s_info)) return throwError(exec, TypeError); JSHTMLDocument* castedThisObj = static_cast<JSHTMLDocument*>(asObject(thisValue)); return castedThisObj->open(exec, args); } -JSValuePtr jsHTMLDocumentPrototypeFunctionClose(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionClose(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLDocument::s_info)) return throwError(exec, TypeError); JSHTMLDocument* castedThisObj = static_cast<JSHTMLDocument*>(asObject(thisValue)); HTMLDocument* imp = static_cast<HTMLDocument*>(castedThisObj->impl()); @@ -334,25 +350,28 @@ JSValuePtr jsHTMLDocumentPrototypeFunctionClose(ExecState* exec, JSObject*, JSVa return jsUndefined(); } -JSValuePtr jsHTMLDocumentPrototypeFunctionWrite(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionWrite(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLDocument::s_info)) return throwError(exec, TypeError); JSHTMLDocument* castedThisObj = static_cast<JSHTMLDocument*>(asObject(thisValue)); return castedThisObj->write(exec, args); } -JSValuePtr jsHTMLDocumentPrototypeFunctionWriteln(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionWriteln(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLDocument::s_info)) return throwError(exec, TypeError); JSHTMLDocument* castedThisObj = static_cast<JSHTMLDocument*>(asObject(thisValue)); return castedThisObj->writeln(exec, args); } -JSValuePtr jsHTMLDocumentPrototypeFunctionClear(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionClear(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLDocument::s_info)) return throwError(exec, TypeError); JSHTMLDocument* castedThisObj = static_cast<JSHTMLDocument*>(asObject(thisValue)); HTMLDocument* imp = static_cast<HTMLDocument*>(castedThisObj->impl()); @@ -361,9 +380,10 @@ JSValuePtr jsHTMLDocumentPrototypeFunctionClear(ExecState* exec, JSObject*, JSVa return jsUndefined(); } -JSValuePtr jsHTMLDocumentPrototypeFunctionCaptureEvents(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionCaptureEvents(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLDocument::s_info)) return throwError(exec, TypeError); JSHTMLDocument* castedThisObj = static_cast<JSHTMLDocument*>(asObject(thisValue)); HTMLDocument* imp = static_cast<HTMLDocument*>(castedThisObj->impl()); @@ -372,9 +392,10 @@ JSValuePtr jsHTMLDocumentPrototypeFunctionCaptureEvents(ExecState* exec, JSObjec return jsUndefined(); } -JSValuePtr jsHTMLDocumentPrototypeFunctionReleaseEvents(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionReleaseEvents(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLDocument::s_info)) return throwError(exec, TypeError); JSHTMLDocument* castedThisObj = static_cast<JSHTMLDocument*>(asObject(thisValue)); HTMLDocument* imp = static_cast<HTMLDocument*>(castedThisObj->impl()); @@ -383,15 +404,16 @@ JSValuePtr jsHTMLDocumentPrototypeFunctionReleaseEvents(ExecState* exec, JSObjec return jsUndefined(); } -JSValuePtr jsHTMLDocumentPrototypeFunctionHasFocus(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionHasFocus(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLDocument::s_info)) return throwError(exec, TypeError); JSHTMLDocument* castedThisObj = static_cast<JSHTMLDocument*>(asObject(thisValue)); HTMLDocument* imp = static_cast<HTMLDocument*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsBoolean(imp->hasFocus()); + JSC::JSValue result = jsBoolean(imp->hasFocus()); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.h index 6fc4dc126e..3827df26cd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.h @@ -31,40 +31,41 @@ class JSHTMLDocument : public JSDocument { typedef JSDocument Base; public: JSHTMLDocument(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLDocument>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom attributes - JSC::JSValuePtr all(JSC::ExecState*) const; - void setAll(JSC::ExecState*, JSC::JSValuePtr); + JSC::JSValue all(JSC::ExecState*) const; + void setAll(JSC::ExecState*, JSC::JSValue); // Custom functions - JSC::JSValuePtr open(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr write(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr writeln(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue open(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue write(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue writeln(JSC::ExecState*, const JSC::ArgList&); private: static bool canGetItemsForName(JSC::ExecState*, HTMLDocument*, const JSC::Identifier&); - static JSC::JSValuePtr nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; class JSHTMLDocumentPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -73,40 +74,40 @@ public: // Functions -JSC::JSValuePtr jsHTMLDocumentPrototypeFunctionOpen(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLDocumentPrototypeFunctionClose(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLDocumentPrototypeFunctionWrite(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLDocumentPrototypeFunctionWriteln(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLDocumentPrototypeFunctionClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLDocumentPrototypeFunctionCaptureEvents(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLDocumentPrototypeFunctionReleaseEvents(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLDocumentPrototypeFunctionHasFocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionOpen(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionClose(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionWrite(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionWriteln(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionCaptureEvents(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionReleaseEvents(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionHasFocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLDocumentEmbeds(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLDocumentPlugins(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLDocumentScripts(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLDocumentAll(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLDocumentAll(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLDocumentWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLDocumentHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLDocumentDir(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLDocumentDir(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLDocumentDesignMode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLDocumentDesignMode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLDocumentCompatMode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLDocumentActiveElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLDocumentBgColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLDocumentBgColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLDocumentFgColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLDocumentFgColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLDocumentAlinkColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLDocumentAlinkColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLDocumentLinkColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLDocumentLinkColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLDocumentVlinkColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLDocumentVlinkColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLDocumentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLDocumentEmbeds(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLDocumentPlugins(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLDocumentScripts(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLDocumentAll(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLDocumentAll(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLDocumentWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLDocumentHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLDocumentDir(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLDocumentDir(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLDocumentDesignMode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLDocumentDesignMode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLDocumentCompatMode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLDocumentActiveElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLDocumentBgColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLDocumentBgColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLDocumentFgColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLDocumentFgColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLDocumentAlinkColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLDocumentAlinkColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLDocumentLinkColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLDocumentLinkColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLDocumentVlinkColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLDocumentVlinkColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLDocumentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLElement.cpp index 40d74ac79f..64533948d4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLElement.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLElement); /* Hash table */ @@ -88,13 +88,13 @@ public: JSHTMLElementConstructor(ExecState* exec) : DOMObject(JSHTMLElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -109,10 +109,8 @@ bool JSHTMLElementConstructor::getOwnPropertySlot(ExecState* exec, const Identif /* Hash table for prototype */ -static const HashTableValue JSHTMLElementPrototypeTableValues[6] = +static const HashTableValue JSHTMLElementPrototypeTableValues[4] = { - { "blur", DontDelete|Function, (intptr_t)jsHTMLElementPrototypeFunctionBlur, (intptr_t)0 }, - { "focus", DontDelete|Function, (intptr_t)jsHTMLElementPrototypeFunctionFocus, (intptr_t)0 }, { "insertAdjacentElement", DontDelete|Function, (intptr_t)jsHTMLElementPrototypeFunctionInsertAdjacentElement, (intptr_t)2 }, { "insertAdjacentHTML", DontDelete|Function, (intptr_t)jsHTMLElementPrototypeFunctionInsertAdjacentHTML, (intptr_t)2 }, { "insertAdjacentText", DontDelete|Function, (intptr_t)jsHTMLElementPrototypeFunctionInsertAdjacentText, (intptr_t)2 }, @@ -121,16 +119,16 @@ static const HashTableValue JSHTMLElementPrototypeTableValues[6] = static const HashTable JSHTMLElementPrototypeTable = #if ENABLE(PERFECT_HASH_SIZE) - { 7, JSHTMLElementPrototypeTableValues, 0 }; + { 3, JSHTMLElementPrototypeTableValues, 0 }; #else - { 16, 15, JSHTMLElementPrototypeTableValues, 0 }; + { 8, 7, JSHTMLElementPrototypeTableValues, 0 }; #endif const ClassInfo JSHTMLElementPrototype::s_info = { "HTMLElementPrototype", 0, &JSHTMLElementPrototypeTable, 0 }; -JSObject* JSHTMLElementPrototype::self(ExecState* exec) +JSObject* JSHTMLElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLElement>(exec); + return getDOMPrototype<JSHTMLElement>(exec, globalObject); } bool JSHTMLElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -145,9 +143,9 @@ JSHTMLElement::JSHTMLElement(PassRefPtr<Structure> structure, PassRefPtr<HTMLEle { } -JSObject* JSHTMLElement::createPrototype(ExecState* exec) +JSObject* JSHTMLElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLElementPrototype(JSHTMLElementPrototype::createStructure(JSElementPrototype::self(exec))); + return new (exec) JSHTMLElementPrototype(JSHTMLElementPrototype::createStructure(JSElementPrototype::self(exec, globalObject))); } bool JSHTMLElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -155,130 +153,143 @@ bool JSHTMLElement::getOwnPropertySlot(ExecState* exec, const Identifier& proper return getStaticValueSlot<JSHTMLElement, Base>(exec, &JSHTMLElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLElementId(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLElementId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->id()); } -JSValuePtr jsHTMLElementTitle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLElementTitle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->title()); } -JSValuePtr jsHTMLElementLang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLElementLang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->lang()); } -JSValuePtr jsHTMLElementDir(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLElementDir(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->dir()); } -JSValuePtr jsHTMLElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->className()); } -JSValuePtr jsHTMLElementTabIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLElementTabIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->tabIndex()); } -JSValuePtr jsHTMLElementInnerHTML(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLElementInnerHTML(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->innerHTML()); } -JSValuePtr jsHTMLElementInnerText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLElementInnerText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->innerText()); } -JSValuePtr jsHTMLElementOuterHTML(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLElementOuterHTML(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->outerHTML()); } -JSValuePtr jsHTMLElementOuterText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLElementOuterText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->outerText()); } -JSValuePtr jsHTMLElementChildren(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLElementChildren(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->children())); } -JSValuePtr jsHTMLElementContentEditable(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLElementContentEditable(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->contentEditable()); } -JSValuePtr jsHTMLElementIsContentEditable(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLElementIsContentEditable(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->isContentEditable()); } -JSValuePtr jsHTMLElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLElement, Base>(exec, propertyName, value, &JSHTMLElementTable, this, slot); } -void setJSHTMLElementId(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLElementId(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(thisObject)->impl()); imp->setId(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLElementTitle(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLElementTitle(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(thisObject)->impl()); imp->setTitle(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLElementLang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLElementLang(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(thisObject)->impl()); imp->setLang(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLElementDir(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLElementDir(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(thisObject)->impl()); imp->setDir(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLElementClassName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLElementClassName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(thisObject)->impl()); imp->setClassName(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLElementTabIndex(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLElementTabIndex(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(thisObject)->impl()); - imp->setTabIndex(value->toInt32(exec)); + imp->setTabIndex(value.toInt32(exec)); } -void setJSHTMLElementInnerHTML(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLElementInnerHTML(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -286,7 +297,7 @@ void setJSHTMLElementInnerHTML(ExecState* exec, JSObject* thisObject, JSValuePtr setDOMException(exec, ec); } -void setJSHTMLElementInnerText(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLElementInnerText(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -294,7 +305,7 @@ void setJSHTMLElementInnerText(ExecState* exec, JSObject* thisObject, JSValuePtr setDOMException(exec, ec); } -void setJSHTMLElementOuterHTML(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLElementOuterHTML(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -302,7 +313,7 @@ void setJSHTMLElementOuterHTML(ExecState* exec, JSObject* thisObject, JSValuePtr setDOMException(exec, ec); } -void setJSHTMLElementOuterText(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLElementOuterText(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -310,88 +321,69 @@ void setJSHTMLElementOuterText(ExecState* exec, JSObject* thisObject, JSValuePtr setDOMException(exec, ec); } -void setJSHTMLElementContentEditable(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLElementContentEditable(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLElement* imp = static_cast<HTMLElement*>(static_cast<JSHTMLElement*>(thisObject)->impl()); imp->setContentEditable(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLElement::getConstructor(ExecState* exec) +JSValue JSHTMLElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLElementConstructor>(exec); } -JSValuePtr jsHTMLElementPrototypeFunctionBlur(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLElementPrototypeFunctionInsertAdjacentElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLElement::s_info)) - return throwError(exec, TypeError); - JSHTMLElement* castedThisObj = static_cast<JSHTMLElement*>(asObject(thisValue)); - HTMLElement* imp = static_cast<HTMLElement*>(castedThisObj->impl()); - - imp->blur(); - return jsUndefined(); -} - -JSValuePtr jsHTMLElementPrototypeFunctionFocus(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) -{ - if (!thisValue->isObject(&JSHTMLElement::s_info)) - return throwError(exec, TypeError); - JSHTMLElement* castedThisObj = static_cast<JSHTMLElement*>(asObject(thisValue)); - HTMLElement* imp = static_cast<HTMLElement*>(castedThisObj->impl()); - - imp->focus(); - return jsUndefined(); -} - -JSValuePtr jsHTMLElementPrototypeFunctionInsertAdjacentElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) -{ - if (!thisValue->isObject(&JSHTMLElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLElement::s_info)) return throwError(exec, TypeError); JSHTMLElement* castedThisObj = static_cast<JSHTMLElement*>(asObject(thisValue)); HTMLElement* imp = static_cast<HTMLElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& where = args.at(exec, 0)->toString(exec); - Element* element = toElement(args.at(exec, 1)); + const UString& where = args.at(0).toString(exec); + Element* element = toElement(args.at(1)); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->insertAdjacentElement(where, element, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->insertAdjacentElement(where, element, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsHTMLElementPrototypeFunctionInsertAdjacentHTML(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLElementPrototypeFunctionInsertAdjacentHTML(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLElement::s_info)) return throwError(exec, TypeError); JSHTMLElement* castedThisObj = static_cast<JSHTMLElement*>(asObject(thisValue)); HTMLElement* imp = static_cast<HTMLElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& where = args.at(exec, 0)->toString(exec); - const UString& html = args.at(exec, 1)->toString(exec); + const UString& where = args.at(0).toString(exec); + const UString& html = args.at(1).toString(exec); imp->insertAdjacentHTML(where, html, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsHTMLElementPrototypeFunctionInsertAdjacentText(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLElementPrototypeFunctionInsertAdjacentText(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLElement::s_info)) return throwError(exec, TypeError); JSHTMLElement* castedThisObj = static_cast<JSHTMLElement*>(asObject(thisValue)); HTMLElement* imp = static_cast<HTMLElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& where = args.at(exec, 0)->toString(exec); - const UString& text = args.at(exec, 1)->toString(exec); + const UString& where = args.at(0).toString(exec); + const UString& text = args.at(1).toString(exec); imp->insertAdjacentText(where, text, ec); setDOMException(exec, ec); return jsUndefined(); } -HTMLElement* toHTMLElement(JSC::JSValuePtr value) +HTMLElement* toHTMLElement(JSC::JSValue value) { - return value->isObject(&JSHTMLElement::s_info) ? static_cast<JSHTMLElement*>(asObject(value))->impl() : 0; + return value.isObject(&JSHTMLElement::s_info) ? static_cast<JSHTMLElement*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLElement.h index 34df6fa8ae..dda203f3c8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLElement.h @@ -31,35 +31,36 @@ class JSHTMLElement : public JSElement { typedef JSElement Base; public: JSHTMLElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void pushEventHandlerScope(JSC::ExecState*, JSC::ScopeChain&) const; - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); HTMLElement* impl() const { return static_cast<HTMLElement*>(Base::impl()); } }; -HTMLElement* toHTMLElement(JSC::JSValuePtr); +HTMLElement* toHTMLElement(JSC::JSValue); class JSHTMLElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -68,38 +69,36 @@ public: // Functions -JSC::JSValuePtr jsHTMLElementPrototypeFunctionBlur(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLElementPrototypeFunctionFocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLElementPrototypeFunctionInsertAdjacentElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLElementPrototypeFunctionInsertAdjacentHTML(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLElementPrototypeFunctionInsertAdjacentText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLElementPrototypeFunctionInsertAdjacentElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLElementPrototypeFunctionInsertAdjacentHTML(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLElementPrototypeFunctionInsertAdjacentText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLElementId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLElementId(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLElementTitle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLElementTitle(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLElementLang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLElementLang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLElementDir(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLElementDir(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLElementClassName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLElementTabIndex(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLElementTabIndex(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLElementInnerHTML(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLElementInnerHTML(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLElementInnerText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLElementInnerText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLElementOuterHTML(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLElementOuterHTML(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLElementOuterText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLElementOuterText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLElementChildren(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLElementContentEditable(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLElementContentEditable(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLElementIsContentEditable(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLElementId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLElementId(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLElementTitle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLElementTitle(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLElementLang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLElementLang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLElementDir(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLElementDir(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLElementClassName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLElementTabIndex(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLElementTabIndex(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLElementInnerHTML(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLElementInnerHTML(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLElementInnerText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLElementInnerText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLElementOuterHTML(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLElementOuterHTML(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLElementOuterText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLElementOuterText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLElementChildren(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLElementContentEditable(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLElementContentEditable(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLElementIsContentEditable(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLEmbedElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLEmbedElement.cpp index 9a7b60622a..ec19e83180 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLEmbedElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLEmbedElement.cpp @@ -40,7 +40,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLEmbedElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLEmbedElement); /* Hash table */ @@ -82,13 +82,13 @@ public: JSHTMLEmbedElementConstructor(ExecState* exec) : DOMObject(JSHTMLEmbedElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLEmbedElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLEmbedElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -118,9 +118,9 @@ static const HashTable JSHTMLEmbedElementPrototypeTable = const ClassInfo JSHTMLEmbedElementPrototype::s_info = { "HTMLEmbedElementPrototype", 0, &JSHTMLEmbedElementPrototypeTable, 0 }; -JSObject* JSHTMLEmbedElementPrototype::self(ExecState* exec) +JSObject* JSHTMLEmbedElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLEmbedElement>(exec); + return getDOMPrototype<JSHTMLEmbedElement>(exec, globalObject); } bool JSHTMLEmbedElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -135,9 +135,9 @@ JSHTMLEmbedElement::JSHTMLEmbedElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSHTMLEmbedElement::createPrototype(ExecState* exec) +JSObject* JSHTMLEmbedElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLEmbedElementPrototype(JSHTMLEmbedElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLEmbedElementPrototype(JSHTMLEmbedElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLEmbedElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -151,97 +151,104 @@ bool JSHTMLEmbedElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSHTMLEmbedElement, Base>(exec, &JSHTMLEmbedElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLEmbedElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLEmbedElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLEmbedElement* imp = static_cast<HTMLEmbedElement*>(static_cast<JSHTMLEmbedElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLEmbedElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLEmbedElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLEmbedElement* imp = static_cast<HTMLEmbedElement*>(static_cast<JSHTMLEmbedElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->height()); } -JSValuePtr jsHTMLEmbedElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLEmbedElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLEmbedElement* imp = static_cast<HTMLEmbedElement*>(static_cast<JSHTMLEmbedElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsHTMLEmbedElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLEmbedElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLEmbedElement* imp = static_cast<HTMLEmbedElement*>(static_cast<JSHTMLEmbedElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->src()); } -JSValuePtr jsHTMLEmbedElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLEmbedElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLEmbedElement* imp = static_cast<HTMLEmbedElement*>(static_cast<JSHTMLEmbedElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsHTMLEmbedElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLEmbedElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLEmbedElement* imp = static_cast<HTMLEmbedElement*>(static_cast<JSHTMLEmbedElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->width()); } -JSValuePtr jsHTMLEmbedElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLEmbedElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLEmbedElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLEmbedElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLEmbedElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { if (customPut(exec, propertyName, value, slot)) return; lookupPut<JSHTMLEmbedElement, Base>(exec, propertyName, value, &JSHTMLEmbedElementTable, this, slot); } -void setJSHTMLEmbedElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLEmbedElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLEmbedElement* imp = static_cast<HTMLEmbedElement*>(static_cast<JSHTMLEmbedElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLEmbedElementHeight(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLEmbedElementHeight(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLEmbedElement* imp = static_cast<HTMLEmbedElement*>(static_cast<JSHTMLEmbedElement*>(thisObject)->impl()); imp->setHeight(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLEmbedElementName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLEmbedElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLEmbedElement* imp = static_cast<HTMLEmbedElement*>(static_cast<JSHTMLEmbedElement*>(thisObject)->impl()); imp->setName(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLEmbedElementSrc(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLEmbedElementSrc(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLEmbedElement* imp = static_cast<HTMLEmbedElement*>(static_cast<JSHTMLEmbedElement*>(thisObject)->impl()); imp->setSrc(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLEmbedElementType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLEmbedElementType(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLEmbedElement* imp = static_cast<HTMLEmbedElement*>(static_cast<JSHTMLEmbedElement*>(thisObject)->impl()); imp->setType(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLEmbedElementWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLEmbedElementWidth(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLEmbedElement* imp = static_cast<HTMLEmbedElement*>(static_cast<JSHTMLEmbedElement*>(thisObject)->impl()); imp->setWidth(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLEmbedElement::getConstructor(ExecState* exec) +JSValue JSHTMLEmbedElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLEmbedElementConstructor>(exec); } -JSValuePtr jsHTMLEmbedElementPrototypeFunctionGetSVGDocument(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLEmbedElementPrototypeFunctionGetSVGDocument(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLEmbedElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLEmbedElement::s_info)) return throwError(exec, TypeError); JSHTMLEmbedElement* castedThisObj = static_cast<JSHTMLEmbedElement*>(asObject(thisValue)); HTMLEmbedElement* imp = static_cast<HTMLEmbedElement*>(castedThisObj->impl()); @@ -250,7 +257,7 @@ JSValuePtr jsHTMLEmbedElementPrototypeFunctionGetSVGDocument(ExecState* exec, JS return jsUndefined(); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getSVGDocument(ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getSVGDocument(ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLEmbedElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLEmbedElement.h index c9f2f25199..defb587d0b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLEmbedElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLEmbedElement.h @@ -32,35 +32,36 @@ class JSHTMLEmbedElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLEmbedElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLEmbedElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); bool customGetOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); - bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); + bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual JSC::CallType getCallData(JSC::CallData&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); private: static bool canGetItemsForName(JSC::ExecState*, HTMLEmbedElement*, const JSC::Identifier&); - static JSC::JSValuePtr nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; class JSHTMLEmbedElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -69,22 +70,22 @@ public: // Functions -JSC::JSValuePtr jsHTMLEmbedElementPrototypeFunctionGetSVGDocument(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLEmbedElementPrototypeFunctionGetSVGDocument(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLEmbedElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLEmbedElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLEmbedElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLEmbedElementHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLEmbedElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLEmbedElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLEmbedElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLEmbedElementSrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLEmbedElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLEmbedElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLEmbedElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLEmbedElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLEmbedElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLEmbedElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLEmbedElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLEmbedElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLEmbedElementHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLEmbedElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLEmbedElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLEmbedElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLEmbedElementSrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLEmbedElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLEmbedElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLEmbedElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLEmbedElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLEmbedElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFieldSetElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLFieldSetElement.cpp index 26afc14f5a..c1acb4ebf3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFieldSetElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFieldSetElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLFieldSetElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLFieldSetElement); /* Hash table */ @@ -72,13 +72,13 @@ public: JSHTMLFieldSetElementConstructor(ExecState* exec) : DOMObject(JSHTMLFieldSetElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLFieldSetElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLFieldSetElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -107,9 +107,9 @@ static const HashTable JSHTMLFieldSetElementPrototypeTable = const ClassInfo JSHTMLFieldSetElementPrototype::s_info = { "HTMLFieldSetElementPrototype", 0, &JSHTMLFieldSetElementPrototypeTable, 0 }; -JSObject* JSHTMLFieldSetElementPrototype::self(ExecState* exec) +JSObject* JSHTMLFieldSetElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLFieldSetElement>(exec); + return getDOMPrototype<JSHTMLFieldSetElement>(exec, globalObject); } const ClassInfo JSHTMLFieldSetElement::s_info = { "HTMLFieldSetElement", &JSHTMLElement::s_info, &JSHTMLFieldSetElementTable, 0 }; @@ -119,9 +119,9 @@ JSHTMLFieldSetElement::JSHTMLFieldSetElement(PassRefPtr<Structure> structure, Pa { } -JSObject* JSHTMLFieldSetElement::createPrototype(ExecState* exec) +JSObject* JSHTMLFieldSetElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLFieldSetElementPrototype(JSHTMLFieldSetElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLFieldSetElementPrototype(JSHTMLFieldSetElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLFieldSetElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -129,23 +129,25 @@ bool JSHTMLFieldSetElement::getOwnPropertySlot(ExecState* exec, const Identifier return getStaticValueSlot<JSHTMLFieldSetElement, Base>(exec, &JSHTMLFieldSetElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLFieldSetElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFieldSetElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFieldSetElement* imp = static_cast<HTMLFieldSetElement*>(static_cast<JSHTMLFieldSetElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->form())); } -JSValuePtr jsHTMLFieldSetElementWillValidate(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFieldSetElementWillValidate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFieldSetElement* imp = static_cast<HTMLFieldSetElement*>(static_cast<JSHTMLFieldSetElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->willValidate()); } -JSValuePtr jsHTMLFieldSetElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFieldSetElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLFieldSetElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSHTMLFieldSetElement::getConstructor(ExecState* exec) +JSValue JSHTMLFieldSetElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLFieldSetElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFieldSetElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLFieldSetElement.h index b885d87257..fa6c56c15b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFieldSetElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFieldSetElement.h @@ -31,23 +31,24 @@ class JSHTMLFieldSetElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLFieldSetElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLFieldSetElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLFieldSetElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLFieldSetElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -55,9 +56,9 @@ public: // Attributes -JSC::JSValuePtr jsHTMLFieldSetElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLFieldSetElementWillValidate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLFieldSetElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLFieldSetElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLFieldSetElementWillValidate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLFieldSetElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.cpp index da127cb390..9d9a493671 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLFontElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLFontElement); /* Hash table */ @@ -73,13 +73,13 @@ public: JSHTMLFontElementConstructor(ExecState* exec) : DOMObject(JSHTMLFontElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLFontElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLFontElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -108,9 +108,9 @@ static const HashTable JSHTMLFontElementPrototypeTable = const ClassInfo JSHTMLFontElementPrototype::s_info = { "HTMLFontElementPrototype", 0, &JSHTMLFontElementPrototypeTable, 0 }; -JSObject* JSHTMLFontElementPrototype::self(ExecState* exec) +JSObject* JSHTMLFontElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLFontElement>(exec); + return getDOMPrototype<JSHTMLFontElement>(exec, globalObject); } const ClassInfo JSHTMLFontElement::s_info = { "HTMLFontElement", &JSHTMLElement::s_info, &JSHTMLFontElementTable, 0 }; @@ -120,9 +120,9 @@ JSHTMLFontElement::JSHTMLFontElement(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSHTMLFontElement::createPrototype(ExecState* exec) +JSObject* JSHTMLFontElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLFontElementPrototype(JSHTMLFontElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLFontElementPrototype(JSHTMLFontElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLFontElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -130,52 +130,55 @@ bool JSHTMLFontElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSHTMLFontElement, Base>(exec, &JSHTMLFontElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLFontElementColor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFontElementColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFontElement* imp = static_cast<HTMLFontElement*>(static_cast<JSHTMLFontElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->color()); } -JSValuePtr jsHTMLFontElementFace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFontElementFace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFontElement* imp = static_cast<HTMLFontElement*>(static_cast<JSHTMLFontElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->face()); } -JSValuePtr jsHTMLFontElementSize(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFontElementSize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFontElement* imp = static_cast<HTMLFontElement*>(static_cast<JSHTMLFontElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->size()); } -JSValuePtr jsHTMLFontElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFontElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLFontElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLFontElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLFontElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLFontElement, Base>(exec, propertyName, value, &JSHTMLFontElementTable, this, slot); } -void setJSHTMLFontElementColor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFontElementColor(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFontElement* imp = static_cast<HTMLFontElement*>(static_cast<JSHTMLFontElement*>(thisObject)->impl()); imp->setColor(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLFontElementFace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFontElementFace(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFontElement* imp = static_cast<HTMLFontElement*>(static_cast<JSHTMLFontElement*>(thisObject)->impl()); imp->setFace(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLFontElementSize(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFontElementSize(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFontElement* imp = static_cast<HTMLFontElement*>(static_cast<JSHTMLFontElement*>(thisObject)->impl()); imp->setSize(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLFontElement::getConstructor(ExecState* exec) +JSValue JSHTMLFontElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLFontElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.h index 6c38b3bdd1..c53d90aa48 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.h @@ -31,24 +31,25 @@ class JSHTMLFontElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLFontElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLFontElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLFontElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLFontElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,13 +57,13 @@ public: // Attributes -JSC::JSValuePtr jsHTMLFontElementColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFontElementColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFontElementFace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFontElementFace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFontElementSize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFontElementSize(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFontElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLFontElementColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFontElementColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFontElementFace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFontElementFace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFontElementSize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFontElementSize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFontElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFormElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLFormElement.cpp index 170ea74ed6..d172404af6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFormElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFormElement.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLFormElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLFormElement); /* Hash table */ @@ -84,13 +84,13 @@ public: JSHTMLFormElementConstructor(ExecState* exec) : DOMObject(JSHTMLFormElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLFormElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLFormElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -121,9 +121,9 @@ static const HashTable JSHTMLFormElementPrototypeTable = const ClassInfo JSHTMLFormElementPrototype::s_info = { "HTMLFormElementPrototype", 0, &JSHTMLFormElementPrototypeTable, 0 }; -JSObject* JSHTMLFormElementPrototype::self(ExecState* exec) +JSObject* JSHTMLFormElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLFormElement>(exec); + return getDOMPrototype<JSHTMLFormElement>(exec, globalObject); } bool JSHTMLFormElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -138,13 +138,19 @@ JSHTMLFormElement::JSHTMLFormElement(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSHTMLFormElement::createPrototype(ExecState* exec) +JSObject* JSHTMLFormElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLFormElementPrototype(JSHTMLFormElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLFormElementPrototype(JSHTMLFormElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLFormElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { + bool ok; + unsigned index = propertyName.toUInt32(&ok, false); + if (ok && index < static_cast<HTMLFormElement*>(impl())->length()) { + slot.setCustomIndex(this, index, indexGetter); + return true; + } if (canGetItemsForName(exec, static_cast<HTMLFormElement*>(impl()), propertyName)) { slot.setCustom(this, nameGetter); return true; @@ -154,115 +160,118 @@ bool JSHTMLFormElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr slot.setCustom(this, entry->propertyGetter()); return true; } - bool ok; - unsigned index = propertyName.toUInt32(&ok, false); - if (ok && index < static_cast<HTMLFormElement*>(impl())->length()) { - slot.setCustomIndex(this, index, indexGetter); - return true; - } return getStaticValueSlot<JSHTMLFormElement, Base>(exec, &JSHTMLFormElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLFormElementElements(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFormElementElements(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFormElement* imp = static_cast<HTMLFormElement*>(static_cast<JSHTMLFormElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->elements())); } -JSValuePtr jsHTMLFormElementLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFormElementLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFormElement* imp = static_cast<HTMLFormElement*>(static_cast<JSHTMLFormElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsHTMLFormElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFormElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFormElement* imp = static_cast<HTMLFormElement*>(static_cast<JSHTMLFormElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsHTMLFormElementAcceptCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFormElementAcceptCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFormElement* imp = static_cast<HTMLFormElement*>(static_cast<JSHTMLFormElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->acceptCharset()); } -JSValuePtr jsHTMLFormElementAction(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFormElementAction(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFormElement* imp = static_cast<HTMLFormElement*>(static_cast<JSHTMLFormElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->action()); } -JSValuePtr jsHTMLFormElementEncoding(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFormElementEncoding(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFormElement* imp = static_cast<HTMLFormElement*>(static_cast<JSHTMLFormElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->encoding()); } -JSValuePtr jsHTMLFormElementEnctype(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFormElementEnctype(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFormElement* imp = static_cast<HTMLFormElement*>(static_cast<JSHTMLFormElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->enctype()); } -JSValuePtr jsHTMLFormElementMethod(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFormElementMethod(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFormElement* imp = static_cast<HTMLFormElement*>(static_cast<JSHTMLFormElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->method()); } -JSValuePtr jsHTMLFormElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFormElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFormElement* imp = static_cast<HTMLFormElement*>(static_cast<JSHTMLFormElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->target()); } -JSValuePtr jsHTMLFormElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFormElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLFormElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLFormElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLFormElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLFormElement, Base>(exec, propertyName, value, &JSHTMLFormElementTable, this, slot); } -void setJSHTMLFormElementName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFormElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFormElement* imp = static_cast<HTMLFormElement*>(static_cast<JSHTMLFormElement*>(thisObject)->impl()); imp->setName(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLFormElementAcceptCharset(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFormElementAcceptCharset(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFormElement* imp = static_cast<HTMLFormElement*>(static_cast<JSHTMLFormElement*>(thisObject)->impl()); imp->setAcceptCharset(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLFormElementAction(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFormElementAction(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFormElement* imp = static_cast<HTMLFormElement*>(static_cast<JSHTMLFormElement*>(thisObject)->impl()); imp->setAction(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLFormElementEncoding(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFormElementEncoding(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFormElement* imp = static_cast<HTMLFormElement*>(static_cast<JSHTMLFormElement*>(thisObject)->impl()); imp->setEncoding(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLFormElementEnctype(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFormElementEnctype(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFormElement* imp = static_cast<HTMLFormElement*>(static_cast<JSHTMLFormElement*>(thisObject)->impl()); imp->setEnctype(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLFormElementMethod(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFormElementMethod(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFormElement* imp = static_cast<HTMLFormElement*>(static_cast<JSHTMLFormElement*>(thisObject)->impl()); imp->setMethod(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLFormElementTarget(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFormElementTarget(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFormElement* imp = static_cast<HTMLFormElement*>(static_cast<JSHTMLFormElement*>(thisObject)->impl()); imp->setTarget(valueToStringWithNullCheck(exec, value)); @@ -275,25 +284,24 @@ void JSHTMLFormElement::getPropertyNames(ExecState* exec, PropertyNameArray& pro Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSHTMLFormElement::getConstructor(ExecState* exec) +JSValue JSHTMLFormElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLFormElementConstructor>(exec); } -JSValuePtr jsHTMLFormElementPrototypeFunctionSubmit(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLFormElementPrototypeFunctionSubmit(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLFormElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLFormElement::s_info)) return throwError(exec, TypeError); JSHTMLFormElement* castedThisObj = static_cast<JSHTMLFormElement*>(asObject(thisValue)); - HTMLFormElement* imp = static_cast<HTMLFormElement*>(castedThisObj->impl()); - - imp->submit(); - return jsUndefined(); + return castedThisObj->submit(exec, args); } -JSValuePtr jsHTMLFormElementPrototypeFunctionReset(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLFormElementPrototypeFunctionReset(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLFormElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLFormElement::s_info)) return throwError(exec, TypeError); JSHTMLFormElement* castedThisObj = static_cast<JSHTMLFormElement*>(asObject(thisValue)); HTMLFormElement* imp = static_cast<HTMLFormElement*>(castedThisObj->impl()); @@ -303,7 +311,7 @@ JSValuePtr jsHTMLFormElementPrototypeFunctionReset(ExecState* exec, JSObject*, J } -JSValuePtr JSHTMLFormElement::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue JSHTMLFormElement::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSHTMLFormElement* thisObj = static_cast<JSHTMLFormElement*>(asObject(slot.slotBase())); return toJS(exec, static_cast<HTMLFormElement*>(thisObj->impl())->item(slot.index())); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFormElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLFormElement.h index e15612622d..b44e6db04b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFormElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFormElement.h @@ -31,33 +31,37 @@ class JSHTMLFormElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLFormElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLFormElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); - static JSC::JSValuePtr indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue getConstructor(JSC::ExecState*); + + // Custom functions + JSC::JSValue submit(JSC::ExecState*, const JSC::ArgList&); + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); private: static bool canGetItemsForName(JSC::ExecState*, HTMLFormElement*, const JSC::Identifier&); - static JSC::JSValuePtr nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; class JSHTMLFormElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -66,27 +70,27 @@ public: // Functions -JSC::JSValuePtr jsHTMLFormElementPrototypeFunctionSubmit(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLFormElementPrototypeFunctionReset(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLFormElementPrototypeFunctionSubmit(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLFormElementPrototypeFunctionReset(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLFormElementElements(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLFormElementLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLFormElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFormElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFormElementAcceptCharset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFormElementAcceptCharset(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFormElementAction(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFormElementAction(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFormElementEncoding(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFormElementEncoding(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFormElementEnctype(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFormElementEnctype(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFormElementMethod(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFormElementMethod(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFormElementTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFormElementTarget(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFormElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLFormElementElements(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLFormElementLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLFormElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFormElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFormElementAcceptCharset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFormElementAcceptCharset(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFormElementAction(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFormElementAction(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFormElementEncoding(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFormElementEncoding(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFormElementEnctype(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFormElementEnctype(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFormElementMethod(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFormElementMethod(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFormElementTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFormElementTarget(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFormElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameElement.cpp index 8db4416bdb..bf6fb63c62 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameElement.cpp @@ -42,7 +42,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLFrameElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLFrameElement); /* Hash table */ @@ -91,13 +91,13 @@ public: JSHTMLFrameElementConstructor(ExecState* exec) : DOMObject(JSHTMLFrameElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLFrameElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLFrameElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -127,9 +127,9 @@ static const HashTable JSHTMLFrameElementPrototypeTable = const ClassInfo JSHTMLFrameElementPrototype::s_info = { "HTMLFrameElementPrototype", 0, &JSHTMLFrameElementPrototypeTable, 0 }; -JSObject* JSHTMLFrameElementPrototype::self(ExecState* exec) +JSObject* JSHTMLFrameElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLFrameElement>(exec); + return getDOMPrototype<JSHTMLFrameElement>(exec, globalObject); } bool JSHTMLFrameElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -144,9 +144,9 @@ JSHTMLFrameElement::JSHTMLFrameElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSHTMLFrameElement::createPrototype(ExecState* exec) +JSObject* JSHTMLFrameElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLFrameElementPrototype(JSHTMLFrameElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLFrameElementPrototype(JSHTMLFrameElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLFrameElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -154,153 +154,166 @@ bool JSHTMLFrameElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSHTMLFrameElement, Base>(exec, &JSHTMLFrameElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLFrameElementFrameBorder(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameElementFrameBorder(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->frameBorder()); } -JSValuePtr jsHTMLFrameElementLongDesc(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameElementLongDesc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->longDesc()); } -JSValuePtr jsHTMLFrameElementMarginHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameElementMarginHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->marginHeight()); } -JSValuePtr jsHTMLFrameElementMarginWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameElementMarginWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->marginWidth()); } -JSValuePtr jsHTMLFrameElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsHTMLFrameElementNoResize(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameElementNoResize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->noResize()); } -JSValuePtr jsHTMLFrameElementScrolling(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameElementScrolling(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->scrolling()); } -JSValuePtr jsHTMLFrameElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->src()); } -JSValuePtr jsHTMLFrameElementContentDocument(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameElementContentDocument(ExecState* exec, const Identifier&, const PropertySlot& slot) { HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(asObject(slot.slotBase()))->impl()); return checkNodeSecurity(exec, imp->contentDocument()) ? toJS(exec, WTF::getPtr(imp->contentDocument())) : jsUndefined(); } -JSValuePtr jsHTMLFrameElementContentWindow(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameElementContentWindow(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->contentWindow())); } -JSValuePtr jsHTMLFrameElementLocation(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameElementLocation(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->location()); } -JSValuePtr jsHTMLFrameElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->width()); } -JSValuePtr jsHTMLFrameElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->height()); } -JSValuePtr jsHTMLFrameElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLFrameElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLFrameElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLFrameElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLFrameElement, Base>(exec, propertyName, value, &JSHTMLFrameElementTable, this, slot); } -void setJSHTMLFrameElementFrameBorder(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFrameElementFrameBorder(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(thisObject)->impl()); imp->setFrameBorder(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLFrameElementLongDesc(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFrameElementLongDesc(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(thisObject)->impl()); imp->setLongDesc(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLFrameElementMarginHeight(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFrameElementMarginHeight(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(thisObject)->impl()); imp->setMarginHeight(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLFrameElementMarginWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFrameElementMarginWidth(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(thisObject)->impl()); imp->setMarginWidth(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLFrameElementName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFrameElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(thisObject)->impl()); imp->setName(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLFrameElementNoResize(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFrameElementNoResize(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(thisObject)->impl()); - imp->setNoResize(value->toBoolean(exec)); + imp->setNoResize(value.toBoolean(exec)); } -void setJSHTMLFrameElementScrolling(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFrameElementScrolling(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(static_cast<JSHTMLFrameElement*>(thisObject)->impl()); imp->setScrolling(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLFrameElementSrc(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFrameElementSrc(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSHTMLFrameElement*>(thisObject)->setSrc(exec, value); } -void setJSHTMLFrameElementLocation(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFrameElementLocation(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSHTMLFrameElement*>(thisObject)->setLocation(exec, value); } -JSValuePtr JSHTMLFrameElement::getConstructor(ExecState* exec) +JSValue JSHTMLFrameElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLFrameElementConstructor>(exec); } -JSValuePtr jsHTMLFrameElementPrototypeFunctionGetSVGDocument(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLFrameElementPrototypeFunctionGetSVGDocument(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLFrameElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLFrameElement::s_info)) return throwError(exec, TypeError); JSHTMLFrameElement* castedThisObj = static_cast<JSHTMLFrameElement*>(asObject(thisValue)); HTMLFrameElement* imp = static_cast<HTMLFrameElement*>(castedThisObj->impl()); @@ -309,7 +322,7 @@ JSValuePtr jsHTMLFrameElementPrototypeFunctionGetSVGDocument(ExecState* exec, JS return jsUndefined(); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getSVGDocument(ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getSVGDocument(ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameElement.h index 06e272ad40..573ff5298d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameElement.h @@ -31,32 +31,33 @@ class JSHTMLFrameElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLFrameElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLFrameElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom attributes - void setSrc(JSC::ExecState*, JSC::JSValuePtr); - void setLocation(JSC::ExecState*, JSC::JSValuePtr); + void setSrc(JSC::ExecState*, JSC::JSValue); + void setLocation(JSC::ExecState*, JSC::JSValue); }; class JSHTMLFrameElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -65,32 +66,32 @@ public: // Functions -JSC::JSValuePtr jsHTMLFrameElementPrototypeFunctionGetSVGDocument(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLFrameElementPrototypeFunctionGetSVGDocument(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLFrameElementFrameBorder(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFrameElementFrameBorder(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFrameElementLongDesc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFrameElementLongDesc(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFrameElementMarginHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFrameElementMarginHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFrameElementMarginWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFrameElementMarginWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFrameElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFrameElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFrameElementNoResize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFrameElementNoResize(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFrameElementScrolling(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFrameElementScrolling(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFrameElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFrameElementSrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFrameElementContentDocument(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLFrameElementContentWindow(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLFrameElementLocation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFrameElementLocation(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFrameElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLFrameElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLFrameElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLFrameElementFrameBorder(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFrameElementFrameBorder(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFrameElementLongDesc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFrameElementLongDesc(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFrameElementMarginHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFrameElementMarginHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFrameElementMarginWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFrameElementMarginWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFrameElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFrameElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFrameElementNoResize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFrameElementNoResize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFrameElementScrolling(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFrameElementScrolling(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFrameElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFrameElementSrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFrameElementContentDocument(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLFrameElementContentWindow(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLFrameElementLocation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFrameElementLocation(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFrameElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLFrameElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLFrameElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameSetElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameSetElement.cpp index c2563b9cf3..e53caa6546 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameSetElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameSetElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLFrameSetElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLFrameSetElement); /* Hash table */ @@ -73,13 +73,13 @@ public: JSHTMLFrameSetElementConstructor(ExecState* exec) : DOMObject(JSHTMLFrameSetElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLFrameSetElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLFrameSetElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -108,9 +108,9 @@ static const HashTable JSHTMLFrameSetElementPrototypeTable = const ClassInfo JSHTMLFrameSetElementPrototype::s_info = { "HTMLFrameSetElementPrototype", 0, &JSHTMLFrameSetElementPrototypeTable, 0 }; -JSObject* JSHTMLFrameSetElementPrototype::self(ExecState* exec) +JSObject* JSHTMLFrameSetElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLFrameSetElement>(exec); + return getDOMPrototype<JSHTMLFrameSetElement>(exec, globalObject); } const ClassInfo JSHTMLFrameSetElement::s_info = { "HTMLFrameSetElement", &JSHTMLElement::s_info, &JSHTMLFrameSetElementTable, 0 }; @@ -120,9 +120,9 @@ JSHTMLFrameSetElement::JSHTMLFrameSetElement(PassRefPtr<Structure> structure, Pa { } -JSObject* JSHTMLFrameSetElement::createPrototype(ExecState* exec) +JSObject* JSHTMLFrameSetElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLFrameSetElementPrototype(JSHTMLFrameSetElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLFrameSetElementPrototype(JSHTMLFrameSetElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLFrameSetElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -134,40 +134,42 @@ bool JSHTMLFrameSetElement::getOwnPropertySlot(ExecState* exec, const Identifier return getStaticValueSlot<JSHTMLFrameSetElement, Base>(exec, &JSHTMLFrameSetElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLFrameSetElementCols(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameSetElementCols(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFrameSetElement* imp = static_cast<HTMLFrameSetElement*>(static_cast<JSHTMLFrameSetElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->cols()); } -JSValuePtr jsHTMLFrameSetElementRows(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameSetElementRows(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLFrameSetElement* imp = static_cast<HTMLFrameSetElement*>(static_cast<JSHTMLFrameSetElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->rows()); } -JSValuePtr jsHTMLFrameSetElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLFrameSetElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLFrameSetElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLFrameSetElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLFrameSetElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLFrameSetElement, Base>(exec, propertyName, value, &JSHTMLFrameSetElementTable, this, slot); } -void setJSHTMLFrameSetElementCols(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFrameSetElementCols(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFrameSetElement* imp = static_cast<HTMLFrameSetElement*>(static_cast<JSHTMLFrameSetElement*>(thisObject)->impl()); imp->setCols(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLFrameSetElementRows(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLFrameSetElementRows(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLFrameSetElement* imp = static_cast<HTMLFrameSetElement*>(static_cast<JSHTMLFrameSetElement*>(thisObject)->impl()); imp->setRows(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLFrameSetElement::getConstructor(ExecState* exec) +JSValue JSHTMLFrameSetElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLFrameSetElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameSetElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameSetElement.h index dac7e54cef..ddf3e50ca8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameSetElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameSetElement.h @@ -31,27 +31,28 @@ class JSHTMLFrameSetElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLFrameSetElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLFrameSetElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); private: static bool canGetItemsForName(JSC::ExecState*, HTMLFrameSetElement*, const JSC::Identifier&); - static JSC::JSValuePtr nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; class JSHTMLFrameSetElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLFrameSetElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -59,11 +60,11 @@ public: // Attributes -JSC::JSValuePtr jsHTMLFrameSetElementCols(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFrameSetElementCols(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFrameSetElementRows(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLFrameSetElementRows(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLFrameSetElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLFrameSetElementCols(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFrameSetElementCols(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFrameSetElementRows(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLFrameSetElementRows(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLFrameSetElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLHRElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLHRElement.cpp index 1432abfc41..15defbc26f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLHRElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLHRElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLHRElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLHRElement); /* Hash table */ @@ -74,13 +74,13 @@ public: JSHTMLHRElementConstructor(ExecState* exec) : DOMObject(JSHTMLHRElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLHRElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLHRElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -109,9 +109,9 @@ static const HashTable JSHTMLHRElementPrototypeTable = const ClassInfo JSHTMLHRElementPrototype::s_info = { "HTMLHRElementPrototype", 0, &JSHTMLHRElementPrototypeTable, 0 }; -JSObject* JSHTMLHRElementPrototype::self(ExecState* exec) +JSObject* JSHTMLHRElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLHRElement>(exec); + return getDOMPrototype<JSHTMLHRElement>(exec, globalObject); } const ClassInfo JSHTMLHRElement::s_info = { "HTMLHRElement", &JSHTMLElement::s_info, &JSHTMLHRElementTable, 0 }; @@ -121,9 +121,9 @@ JSHTMLHRElement::JSHTMLHRElement(PassRefPtr<Structure> structure, PassRefPtr<HTM { } -JSObject* JSHTMLHRElement::createPrototype(ExecState* exec) +JSObject* JSHTMLHRElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLHRElementPrototype(JSHTMLHRElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLHRElementPrototype(JSHTMLHRElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLHRElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -131,64 +131,68 @@ bool JSHTMLHRElement::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSHTMLHRElement, Base>(exec, &JSHTMLHRElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLHRElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLHRElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLHRElement* imp = static_cast<HTMLHRElement*>(static_cast<JSHTMLHRElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLHRElementNoShade(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLHRElementNoShade(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLHRElement* imp = static_cast<HTMLHRElement*>(static_cast<JSHTMLHRElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->noShade()); } -JSValuePtr jsHTMLHRElementSize(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLHRElementSize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLHRElement* imp = static_cast<HTMLHRElement*>(static_cast<JSHTMLHRElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->size()); } -JSValuePtr jsHTMLHRElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLHRElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLHRElement* imp = static_cast<HTMLHRElement*>(static_cast<JSHTMLHRElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->width()); } -JSValuePtr jsHTMLHRElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLHRElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLHRElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLHRElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLHRElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLHRElement, Base>(exec, propertyName, value, &JSHTMLHRElementTable, this, slot); } -void setJSHTMLHRElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLHRElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLHRElement* imp = static_cast<HTMLHRElement*>(static_cast<JSHTMLHRElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLHRElementNoShade(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLHRElementNoShade(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLHRElement* imp = static_cast<HTMLHRElement*>(static_cast<JSHTMLHRElement*>(thisObject)->impl()); - imp->setNoShade(value->toBoolean(exec)); + imp->setNoShade(value.toBoolean(exec)); } -void setJSHTMLHRElementSize(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLHRElementSize(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLHRElement* imp = static_cast<HTMLHRElement*>(static_cast<JSHTMLHRElement*>(thisObject)->impl()); imp->setSize(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLHRElementWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLHRElementWidth(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLHRElement* imp = static_cast<HTMLHRElement*>(static_cast<JSHTMLHRElement*>(thisObject)->impl()); imp->setWidth(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLHRElement::getConstructor(ExecState* exec) +JSValue JSHTMLHRElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLHRElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLHRElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLHRElement.h index bd8c3614f6..fb624404ac 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLHRElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLHRElement.h @@ -31,24 +31,25 @@ class JSHTMLHRElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLHRElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLHRElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLHRElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLHRElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,15 +57,15 @@ public: // Attributes -JSC::JSValuePtr jsHTMLHRElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLHRElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLHRElementNoShade(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLHRElementNoShade(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLHRElementSize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLHRElementSize(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLHRElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLHRElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLHRElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLHRElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLHRElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLHRElementNoShade(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLHRElementNoShade(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLHRElementSize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLHRElementSize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLHRElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLHRElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLHRElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadElement.cpp index 9c7af5c40a..859dfbe94b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLHeadElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLHeadElement); /* Hash table */ @@ -71,13 +71,13 @@ public: JSHTMLHeadElementConstructor(ExecState* exec) : DOMObject(JSHTMLHeadElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLHeadElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLHeadElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -106,9 +106,9 @@ static const HashTable JSHTMLHeadElementPrototypeTable = const ClassInfo JSHTMLHeadElementPrototype::s_info = { "HTMLHeadElementPrototype", 0, &JSHTMLHeadElementPrototypeTable, 0 }; -JSObject* JSHTMLHeadElementPrototype::self(ExecState* exec) +JSObject* JSHTMLHeadElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLHeadElement>(exec); + return getDOMPrototype<JSHTMLHeadElement>(exec, globalObject); } const ClassInfo JSHTMLHeadElement::s_info = { "HTMLHeadElement", &JSHTMLElement::s_info, &JSHTMLHeadElementTable, 0 }; @@ -118,9 +118,9 @@ JSHTMLHeadElement::JSHTMLHeadElement(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSHTMLHeadElement::createPrototype(ExecState* exec) +JSObject* JSHTMLHeadElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLHeadElementPrototype(JSHTMLHeadElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLHeadElementPrototype(JSHTMLHeadElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLHeadElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,28 +128,29 @@ bool JSHTMLHeadElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSHTMLHeadElement, Base>(exec, &JSHTMLHeadElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLHeadElementProfile(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLHeadElementProfile(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLHeadElement* imp = static_cast<HTMLHeadElement*>(static_cast<JSHTMLHeadElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->profile()); } -JSValuePtr jsHTMLHeadElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLHeadElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLHeadElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLHeadElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLHeadElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLHeadElement, Base>(exec, propertyName, value, &JSHTMLHeadElementTable, this, slot); } -void setJSHTMLHeadElementProfile(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLHeadElementProfile(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLHeadElement* imp = static_cast<HTMLHeadElement*>(static_cast<JSHTMLHeadElement*>(thisObject)->impl()); imp->setProfile(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLHeadElement::getConstructor(ExecState* exec) +JSValue JSHTMLHeadElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLHeadElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadElement.h index 8995d290e7..b63b31767f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadElement.h @@ -31,24 +31,25 @@ class JSHTMLHeadElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLHeadElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLHeadElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLHeadElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLHeadElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,9 +57,9 @@ public: // Attributes -JSC::JSValuePtr jsHTMLHeadElementProfile(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLHeadElementProfile(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLHeadElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLHeadElementProfile(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLHeadElementProfile(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLHeadElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadingElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadingElement.cpp index 0ac8d7afbd..28fe537af9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadingElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadingElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLHeadingElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLHeadingElement); /* Hash table */ @@ -71,13 +71,13 @@ public: JSHTMLHeadingElementConstructor(ExecState* exec) : DOMObject(JSHTMLHeadingElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLHeadingElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLHeadingElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -106,9 +106,9 @@ static const HashTable JSHTMLHeadingElementPrototypeTable = const ClassInfo JSHTMLHeadingElementPrototype::s_info = { "HTMLHeadingElementPrototype", 0, &JSHTMLHeadingElementPrototypeTable, 0 }; -JSObject* JSHTMLHeadingElementPrototype::self(ExecState* exec) +JSObject* JSHTMLHeadingElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLHeadingElement>(exec); + return getDOMPrototype<JSHTMLHeadingElement>(exec, globalObject); } const ClassInfo JSHTMLHeadingElement::s_info = { "HTMLHeadingElement", &JSHTMLElement::s_info, &JSHTMLHeadingElementTable, 0 }; @@ -118,9 +118,9 @@ JSHTMLHeadingElement::JSHTMLHeadingElement(PassRefPtr<Structure> structure, Pass { } -JSObject* JSHTMLHeadingElement::createPrototype(ExecState* exec) +JSObject* JSHTMLHeadingElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLHeadingElementPrototype(JSHTMLHeadingElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLHeadingElementPrototype(JSHTMLHeadingElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLHeadingElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,28 +128,29 @@ bool JSHTMLHeadingElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSHTMLHeadingElement, Base>(exec, &JSHTMLHeadingElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLHeadingElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLHeadingElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLHeadingElement* imp = static_cast<HTMLHeadingElement*>(static_cast<JSHTMLHeadingElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLHeadingElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLHeadingElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLHeadingElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLHeadingElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLHeadingElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLHeadingElement, Base>(exec, propertyName, value, &JSHTMLHeadingElementTable, this, slot); } -void setJSHTMLHeadingElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLHeadingElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLHeadingElement* imp = static_cast<HTMLHeadingElement*>(static_cast<JSHTMLHeadingElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLHeadingElement::getConstructor(ExecState* exec) +JSValue JSHTMLHeadingElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLHeadingElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadingElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadingElement.h index 0120cb4828..a5fdd87c25 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadingElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadingElement.h @@ -31,24 +31,25 @@ class JSHTMLHeadingElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLHeadingElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLHeadingElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLHeadingElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLHeadingElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,9 +57,9 @@ public: // Attributes -JSC::JSValuePtr jsHTMLHeadingElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLHeadingElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLHeadingElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLHeadingElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLHeadingElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLHeadingElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLHtmlElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLHtmlElement.cpp index 170640e445..18dc8ebc01 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLHtmlElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLHtmlElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLHtmlElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLHtmlElement); /* Hash table */ @@ -71,13 +71,13 @@ public: JSHTMLHtmlElementConstructor(ExecState* exec) : DOMObject(JSHTMLHtmlElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLHtmlElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLHtmlElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -106,9 +106,9 @@ static const HashTable JSHTMLHtmlElementPrototypeTable = const ClassInfo JSHTMLHtmlElementPrototype::s_info = { "HTMLHtmlElementPrototype", 0, &JSHTMLHtmlElementPrototypeTable, 0 }; -JSObject* JSHTMLHtmlElementPrototype::self(ExecState* exec) +JSObject* JSHTMLHtmlElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLHtmlElement>(exec); + return getDOMPrototype<JSHTMLHtmlElement>(exec, globalObject); } const ClassInfo JSHTMLHtmlElement::s_info = { "HTMLHtmlElement", &JSHTMLElement::s_info, &JSHTMLHtmlElementTable, 0 }; @@ -118,9 +118,9 @@ JSHTMLHtmlElement::JSHTMLHtmlElement(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSHTMLHtmlElement::createPrototype(ExecState* exec) +JSObject* JSHTMLHtmlElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLHtmlElementPrototype(JSHTMLHtmlElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLHtmlElementPrototype(JSHTMLHtmlElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLHtmlElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,28 +128,29 @@ bool JSHTMLHtmlElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSHTMLHtmlElement, Base>(exec, &JSHTMLHtmlElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLHtmlElementVersion(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLHtmlElementVersion(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLHtmlElement* imp = static_cast<HTMLHtmlElement*>(static_cast<JSHTMLHtmlElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->version()); } -JSValuePtr jsHTMLHtmlElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLHtmlElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLHtmlElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLHtmlElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLHtmlElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLHtmlElement, Base>(exec, propertyName, value, &JSHTMLHtmlElementTable, this, slot); } -void setJSHTMLHtmlElementVersion(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLHtmlElementVersion(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLHtmlElement* imp = static_cast<HTMLHtmlElement*>(static_cast<JSHTMLHtmlElement*>(thisObject)->impl()); imp->setVersion(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLHtmlElement::getConstructor(ExecState* exec) +JSValue JSHTMLHtmlElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLHtmlElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLHtmlElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLHtmlElement.h index a5730377e9..b9e49c782f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLHtmlElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLHtmlElement.h @@ -31,24 +31,25 @@ class JSHTMLHtmlElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLHtmlElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLHtmlElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLHtmlElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLHtmlElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,9 +57,9 @@ public: // Attributes -JSC::JSValuePtr jsHTMLHtmlElementVersion(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLHtmlElementVersion(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLHtmlElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLHtmlElementVersion(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLHtmlElementVersion(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLHtmlElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLIFrameElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLIFrameElement.cpp index b8fae772e4..e60f814c7c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLIFrameElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLIFrameElement.cpp @@ -42,7 +42,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLIFrameElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLIFrameElement); /* Hash table */ @@ -90,13 +90,13 @@ public: JSHTMLIFrameElementConstructor(ExecState* exec) : DOMObject(JSHTMLIFrameElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLIFrameElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLIFrameElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -126,9 +126,9 @@ static const HashTable JSHTMLIFrameElementPrototypeTable = const ClassInfo JSHTMLIFrameElementPrototype::s_info = { "HTMLIFrameElementPrototype", 0, &JSHTMLIFrameElementPrototypeTable, 0 }; -JSObject* JSHTMLIFrameElementPrototype::self(ExecState* exec) +JSObject* JSHTMLIFrameElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLIFrameElement>(exec); + return getDOMPrototype<JSHTMLIFrameElement>(exec, globalObject); } bool JSHTMLIFrameElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -143,9 +143,9 @@ JSHTMLIFrameElement::JSHTMLIFrameElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSHTMLIFrameElement::createPrototype(ExecState* exec) +JSObject* JSHTMLIFrameElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLIFrameElementPrototype(JSHTMLIFrameElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLIFrameElementPrototype(JSHTMLIFrameElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLIFrameElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -153,154 +153,166 @@ bool JSHTMLIFrameElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSHTMLIFrameElement, Base>(exec, &JSHTMLIFrameElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLIFrameElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLIFrameElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLIFrameElementFrameBorder(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLIFrameElementFrameBorder(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->frameBorder()); } -JSValuePtr jsHTMLIFrameElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLIFrameElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->height()); } -JSValuePtr jsHTMLIFrameElementLongDesc(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLIFrameElementLongDesc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->longDesc()); } -JSValuePtr jsHTMLIFrameElementMarginHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLIFrameElementMarginHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->marginHeight()); } -JSValuePtr jsHTMLIFrameElementMarginWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLIFrameElementMarginWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->marginWidth()); } -JSValuePtr jsHTMLIFrameElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLIFrameElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsHTMLIFrameElementScrolling(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLIFrameElementScrolling(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->scrolling()); } -JSValuePtr jsHTMLIFrameElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLIFrameElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->src()); } -JSValuePtr jsHTMLIFrameElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLIFrameElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->width()); } -JSValuePtr jsHTMLIFrameElementContentDocument(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLIFrameElementContentDocument(ExecState* exec, const Identifier&, const PropertySlot& slot) { HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(asObject(slot.slotBase()))->impl()); return checkNodeSecurity(exec, imp->contentDocument()) ? toJS(exec, WTF::getPtr(imp->contentDocument())) : jsUndefined(); } -JSValuePtr jsHTMLIFrameElementContentWindow(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLIFrameElementContentWindow(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->contentWindow())); } -JSValuePtr jsHTMLIFrameElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLIFrameElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLIFrameElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLIFrameElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLIFrameElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLIFrameElement, Base>(exec, propertyName, value, &JSHTMLIFrameElementTable, this, slot); } -void setJSHTMLIFrameElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLIFrameElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLIFrameElementFrameBorder(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLIFrameElementFrameBorder(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(thisObject)->impl()); imp->setFrameBorder(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLIFrameElementHeight(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLIFrameElementHeight(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(thisObject)->impl()); imp->setHeight(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLIFrameElementLongDesc(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLIFrameElementLongDesc(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(thisObject)->impl()); imp->setLongDesc(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLIFrameElementMarginHeight(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLIFrameElementMarginHeight(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(thisObject)->impl()); imp->setMarginHeight(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLIFrameElementMarginWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLIFrameElementMarginWidth(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(thisObject)->impl()); imp->setMarginWidth(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLIFrameElementName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLIFrameElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(thisObject)->impl()); imp->setName(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLIFrameElementScrolling(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLIFrameElementScrolling(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(thisObject)->impl()); imp->setScrolling(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLIFrameElementSrc(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLIFrameElementSrc(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSHTMLIFrameElement*>(thisObject)->setSrc(exec, value); } -void setJSHTMLIFrameElementWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLIFrameElementWidth(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(static_cast<JSHTMLIFrameElement*>(thisObject)->impl()); imp->setWidth(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLIFrameElement::getConstructor(ExecState* exec) +JSValue JSHTMLIFrameElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLIFrameElementConstructor>(exec); } -JSValuePtr jsHTMLIFrameElementPrototypeFunctionGetSVGDocument(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLIFrameElementPrototypeFunctionGetSVGDocument(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLIFrameElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLIFrameElement::s_info)) return throwError(exec, TypeError); JSHTMLIFrameElement* castedThisObj = static_cast<JSHTMLIFrameElement*>(asObject(thisValue)); HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(castedThisObj->impl()); @@ -309,7 +321,7 @@ JSValuePtr jsHTMLIFrameElementPrototypeFunctionGetSVGDocument(ExecState* exec, J return jsUndefined(); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getSVGDocument(ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getSVGDocument(ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLIFrameElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLIFrameElement.h index c31fdb2811..158ae70680 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLIFrameElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLIFrameElement.h @@ -31,31 +31,32 @@ class JSHTMLIFrameElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLIFrameElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLIFrameElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom attributes - void setSrc(JSC::ExecState*, JSC::JSValuePtr); + void setSrc(JSC::ExecState*, JSC::JSValue); }; class JSHTMLIFrameElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -64,32 +65,32 @@ public: // Functions -JSC::JSValuePtr jsHTMLIFrameElementPrototypeFunctionGetSVGDocument(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLIFrameElementPrototypeFunctionGetSVGDocument(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLIFrameElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLIFrameElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLIFrameElementFrameBorder(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLIFrameElementFrameBorder(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLIFrameElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLIFrameElementHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLIFrameElementLongDesc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLIFrameElementLongDesc(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLIFrameElementMarginHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLIFrameElementMarginHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLIFrameElementMarginWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLIFrameElementMarginWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLIFrameElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLIFrameElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLIFrameElementScrolling(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLIFrameElementScrolling(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLIFrameElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLIFrameElementSrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLIFrameElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLIFrameElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLIFrameElementContentDocument(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLIFrameElementContentWindow(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLIFrameElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLIFrameElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLIFrameElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLIFrameElementFrameBorder(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLIFrameElementFrameBorder(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLIFrameElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLIFrameElementHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLIFrameElementLongDesc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLIFrameElementLongDesc(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLIFrameElementMarginHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLIFrameElementMarginHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLIFrameElementMarginWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLIFrameElementMarginWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLIFrameElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLIFrameElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLIFrameElementScrolling(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLIFrameElementScrolling(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLIFrameElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLIFrameElementSrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLIFrameElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLIFrameElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLIFrameElementContentDocument(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLIFrameElementContentWindow(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLIFrameElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLImageElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLImageElement.cpp index 0d4af9ce10..2d985eebe5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLImageElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLImageElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLImageElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLImageElement); /* Hash table */ @@ -88,13 +88,13 @@ public: JSHTMLImageElementConstructor(ExecState* exec) : DOMObject(JSHTMLImageElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLImageElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLImageElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -123,9 +123,9 @@ static const HashTable JSHTMLImageElementPrototypeTable = const ClassInfo JSHTMLImageElementPrototype::s_info = { "HTMLImageElementPrototype", 0, &JSHTMLImageElementPrototypeTable, 0 }; -JSObject* JSHTMLImageElementPrototype::self(ExecState* exec) +JSObject* JSHTMLImageElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLImageElement>(exec); + return getDOMPrototype<JSHTMLImageElement>(exec, globalObject); } const ClassInfo JSHTMLImageElement::s_info = { "HTMLImageElement", &JSHTMLElement::s_info, &JSHTMLImageElementTable, 0 }; @@ -135,9 +135,9 @@ JSHTMLImageElement::JSHTMLImageElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSHTMLImageElement::createPrototype(ExecState* exec) +JSObject* JSHTMLImageElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLImageElementPrototype(JSHTMLImageElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLImageElementPrototype(JSHTMLImageElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLImageElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -145,202 +145,220 @@ bool JSHTMLImageElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSHTMLImageElement, Base>(exec, &JSHTMLImageElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLImageElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsHTMLImageElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLImageElementAlt(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementAlt(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->alt()); } -JSValuePtr jsHTMLImageElementBorder(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementBorder(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->border()); } -JSValuePtr jsHTMLImageElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->height()); } -JSValuePtr jsHTMLImageElementHspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementHspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->hspace()); } -JSValuePtr jsHTMLImageElementIsMap(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementIsMap(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->isMap()); } -JSValuePtr jsHTMLImageElementLongDesc(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementLongDesc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->longDesc()); } -JSValuePtr jsHTMLImageElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->src()); } -JSValuePtr jsHTMLImageElementUseMap(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementUseMap(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->useMap()); } -JSValuePtr jsHTMLImageElementVspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementVspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->vspace()); } -JSValuePtr jsHTMLImageElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->width()); } -JSValuePtr jsHTMLImageElementComplete(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementComplete(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->complete()); } -JSValuePtr jsHTMLImageElementLowsrc(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementLowsrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->lowsrc()); } -JSValuePtr jsHTMLImageElementNaturalHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementNaturalHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->naturalHeight()); } -JSValuePtr jsHTMLImageElementNaturalWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementNaturalWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->naturalWidth()); } -JSValuePtr jsHTMLImageElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsHTMLImageElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -JSValuePtr jsHTMLImageElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLImageElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLImageElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLImageElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLImageElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLImageElement, Base>(exec, propertyName, value, &JSHTMLImageElementTable, this, slot); } -void setJSHTMLImageElementName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLImageElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(thisObject)->impl()); imp->setName(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLImageElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLImageElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLImageElementAlt(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLImageElementAlt(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(thisObject)->impl()); imp->setAlt(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLImageElementBorder(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLImageElementBorder(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(thisObject)->impl()); imp->setBorder(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLImageElementHeight(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLImageElementHeight(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(thisObject)->impl()); - imp->setHeight(value->toInt32(exec)); + imp->setHeight(value.toInt32(exec)); } -void setJSHTMLImageElementHspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLImageElementHspace(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(thisObject)->impl()); - imp->setHspace(value->toInt32(exec)); + imp->setHspace(value.toInt32(exec)); } -void setJSHTMLImageElementIsMap(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLImageElementIsMap(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(thisObject)->impl()); - imp->setIsMap(value->toBoolean(exec)); + imp->setIsMap(value.toBoolean(exec)); } -void setJSHTMLImageElementLongDesc(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLImageElementLongDesc(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(thisObject)->impl()); imp->setLongDesc(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLImageElementSrc(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLImageElementSrc(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(thisObject)->impl()); imp->setSrc(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLImageElementUseMap(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLImageElementUseMap(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(thisObject)->impl()); imp->setUseMap(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLImageElementVspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLImageElementVspace(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(thisObject)->impl()); - imp->setVspace(value->toInt32(exec)); + imp->setVspace(value.toInt32(exec)); } -void setJSHTMLImageElementWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLImageElementWidth(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(thisObject)->impl()); - imp->setWidth(value->toInt32(exec)); + imp->setWidth(value.toInt32(exec)); } -void setJSHTMLImageElementLowsrc(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLImageElementLowsrc(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLImageElement* imp = static_cast<HTMLImageElement*>(static_cast<JSHTMLImageElement*>(thisObject)->impl()); imp->setLowsrc(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLImageElement::getConstructor(ExecState* exec) +JSValue JSHTMLImageElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLImageElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLImageElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLImageElement.h index f4d8de171d..d24fda0302 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLImageElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLImageElement.h @@ -31,24 +31,25 @@ class JSHTMLImageElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLImageElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLImageElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLImageElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLImageElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,38 +57,38 @@ public: // Attributes -JSC::JSValuePtr jsHTMLImageElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLImageElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLImageElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLImageElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLImageElementAlt(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLImageElementAlt(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLImageElementBorder(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLImageElementBorder(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLImageElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLImageElementHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLImageElementHspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLImageElementHspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLImageElementIsMap(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLImageElementIsMap(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLImageElementLongDesc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLImageElementLongDesc(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLImageElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLImageElementSrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLImageElementUseMap(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLImageElementUseMap(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLImageElementVspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLImageElementVspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLImageElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLImageElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLImageElementComplete(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLImageElementLowsrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLImageElementLowsrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLImageElementNaturalHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLImageElementNaturalWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLImageElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLImageElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLImageElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLImageElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLImageElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLImageElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLImageElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLImageElementAlt(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLImageElementAlt(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLImageElementBorder(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLImageElementBorder(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLImageElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLImageElementHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLImageElementHspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLImageElementHspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLImageElementIsMap(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLImageElementIsMap(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLImageElementLongDesc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLImageElementLongDesc(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLImageElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLImageElementSrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLImageElementUseMap(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLImageElementUseMap(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLImageElementVspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLImageElementVspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLImageElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLImageElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLImageElementComplete(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLImageElementLowsrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLImageElementLowsrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLImageElementNaturalHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLImageElementNaturalWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLImageElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLImageElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLImageElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.cpp index 2ed990d450..5b241b3782 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.cpp @@ -39,11 +39,11 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLInputElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLInputElement); /* Hash table */ -static const HashTableValue JSHTMLInputElementTableValues[25] = +static const HashTableValue JSHTMLInputElementTableValues[27] = { { "defaultValue", DontDelete, (intptr_t)jsHTMLInputElementDefaultValue, (intptr_t)setJSHTMLInputElementDefaultValue }, { "defaultChecked", DontDelete, (intptr_t)jsHTMLInputElementDefaultChecked, (intptr_t)setJSHTMLInputElementDefaultChecked }, @@ -56,7 +56,9 @@ static const HashTableValue JSHTMLInputElementTableValues[25] = { "disabled", DontDelete, (intptr_t)jsHTMLInputElementDisabled, (intptr_t)setJSHTMLInputElementDisabled }, { "autofocus", DontDelete, (intptr_t)jsHTMLInputElementAutofocus, (intptr_t)setJSHTMLInputElementAutofocus }, { "maxLength", DontDelete, (intptr_t)jsHTMLInputElementMaxLength, (intptr_t)setJSHTMLInputElementMaxLength }, + { "multiple", DontDelete, (intptr_t)jsHTMLInputElementMultiple, (intptr_t)setJSHTMLInputElementMultiple }, { "name", DontDelete, (intptr_t)jsHTMLInputElementName, (intptr_t)setJSHTMLInputElementName }, + { "placeholder", DontDelete, (intptr_t)jsHTMLInputElementPlaceholder, (intptr_t)setJSHTMLInputElementPlaceholder }, { "readOnly", DontDelete, (intptr_t)jsHTMLInputElementReadOnly, (intptr_t)setJSHTMLInputElementReadOnly }, { "size", DontDelete, (intptr_t)jsHTMLInputElementSize, (intptr_t)setJSHTMLInputElementSize }, { "src", DontDelete, (intptr_t)jsHTMLInputElementSrc, (intptr_t)setJSHTMLInputElementSrc }, @@ -76,7 +78,7 @@ static const HashTable JSHTMLInputElementTable = #if ENABLE(PERFECT_HASH_SIZE) { 255, JSHTMLInputElementTableValues, 0 }; #else - { 69, 63, JSHTMLInputElementTableValues, 0 }; + { 70, 63, JSHTMLInputElementTableValues, 0 }; #endif /* Hash table for constructor */ @@ -98,13 +100,13 @@ public: JSHTMLInputElementConstructor(ExecState* exec) : DOMObject(JSHTMLInputElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLInputElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLInputElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -136,9 +138,9 @@ static const HashTable JSHTMLInputElementPrototypeTable = const ClassInfo JSHTMLInputElementPrototype::s_info = { "HTMLInputElementPrototype", 0, &JSHTMLInputElementPrototypeTable, 0 }; -JSObject* JSHTMLInputElementPrototype::self(ExecState* exec) +JSObject* JSHTMLInputElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLInputElement>(exec); + return getDOMPrototype<JSHTMLInputElement>(exec, globalObject); } bool JSHTMLInputElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -153,291 +155,333 @@ JSHTMLInputElement::JSHTMLInputElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSHTMLInputElement::createPrototype(ExecState* exec) +JSObject* JSHTMLInputElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLInputElementPrototype(JSHTMLInputElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLInputElementPrototype(JSHTMLInputElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLInputElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { - if (customGetOwnPropertySlot(exec, propertyName, slot)) - return true; return getStaticValueSlot<JSHTMLInputElement, Base>(exec, &JSHTMLInputElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLInputElementDefaultValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementDefaultValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->defaultValue()); } -JSValuePtr jsHTMLInputElementDefaultChecked(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementDefaultChecked(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->defaultChecked()); } -JSValuePtr jsHTMLInputElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->form())); } -JSValuePtr jsHTMLInputElementAccept(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementAccept(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->accept()); } -JSValuePtr jsHTMLInputElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->accessKey()); } -JSValuePtr jsHTMLInputElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLInputElementAlt(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementAlt(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->alt()); } -JSValuePtr jsHTMLInputElementChecked(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementChecked(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->checked()); } -JSValuePtr jsHTMLInputElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->disabled()); } -JSValuePtr jsHTMLInputElementAutofocus(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementAutofocus(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->autofocus()); } -JSValuePtr jsHTMLInputElementMaxLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementMaxLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->maxLength()); } -JSValuePtr jsHTMLInputElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementMultiple(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); + HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); + return jsBoolean(imp->multiple()); +} + +JSValue jsHTMLInputElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsHTMLInputElementReadOnly(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementPlaceholder(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); + HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); + return jsString(exec, imp->placeholder()); +} + +JSValue jsHTMLInputElementReadOnly(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->readOnly()); } -JSValuePtr jsHTMLInputElementSize(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementSize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->size()); } -JSValuePtr jsHTMLInputElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->src()); } -JSValuePtr jsHTMLInputElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { - HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->type()); + return static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->type(exec); } -JSValuePtr jsHTMLInputElementUseMap(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementUseMap(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->useMap()); } -JSValuePtr jsHTMLInputElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->value()); } -JSValuePtr jsHTMLInputElementWillValidate(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementWillValidate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->willValidate()); } -JSValuePtr jsHTMLInputElementIndeterminate(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementIndeterminate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->indeterminate()); } -JSValuePtr jsHTMLInputElementSelectionStart(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementSelectionStart(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->selectionStart(exec); } -JSValuePtr jsHTMLInputElementSelectionEnd(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementSelectionEnd(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->selectionEnd(exec); } -JSValuePtr jsHTMLInputElementFiles(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementFiles(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->files())); } -JSValuePtr jsHTMLInputElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLInputElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLInputElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLInputElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLInputElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLInputElement, Base>(exec, propertyName, value, &JSHTMLInputElementTable, this, slot); } -void setJSHTMLInputElementDefaultValue(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementDefaultValue(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); imp->setDefaultValue(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLInputElementDefaultChecked(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementDefaultChecked(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); - imp->setDefaultChecked(value->toBoolean(exec)); + imp->setDefaultChecked(value.toBoolean(exec)); } -void setJSHTMLInputElementAccept(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementAccept(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); imp->setAccept(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLInputElementAccessKey(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementAccessKey(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); imp->setAccessKey(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLInputElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLInputElementAlt(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementAlt(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); imp->setAlt(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLInputElementChecked(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementChecked(ExecState* exec, JSObject* thisObject, JSValue value) +{ + HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); + imp->setChecked(value.toBoolean(exec)); +} + +void setJSHTMLInputElementDisabled(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); - imp->setChecked(value->toBoolean(exec)); + imp->setDisabled(value.toBoolean(exec)); } -void setJSHTMLInputElementDisabled(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementAutofocus(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); - imp->setDisabled(value->toBoolean(exec)); + imp->setAutofocus(value.toBoolean(exec)); } -void setJSHTMLInputElementAutofocus(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementMaxLength(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); - imp->setAutofocus(value->toBoolean(exec)); + imp->setMaxLength(value.toInt32(exec)); } -void setJSHTMLInputElementMaxLength(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementMultiple(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); - imp->setMaxLength(value->toInt32(exec)); + imp->setMultiple(value.toBoolean(exec)); } -void setJSHTMLInputElementName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); imp->setName(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLInputElementReadOnly(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementPlaceholder(ExecState* exec, JSObject* thisObject, JSValue value) +{ + HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); + imp->setPlaceholder(value.toString(exec)); +} + +void setJSHTMLInputElementReadOnly(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); - imp->setReadOnly(value->toBoolean(exec)); + imp->setReadOnly(value.toBoolean(exec)); } -void setJSHTMLInputElementSize(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementSize(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); - imp->setSize(value->toInt32(exec)); + imp->setSize(value.toInt32(exec)); } -void setJSHTMLInputElementSrc(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementSrc(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); imp->setSrc(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLInputElementType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementType(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); imp->setType(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLInputElementUseMap(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementUseMap(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); imp->setUseMap(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLInputElementValue(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementValue(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); imp->setValue(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLInputElementIndeterminate(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementIndeterminate(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); - imp->setIndeterminate(value->toBoolean(exec)); + imp->setIndeterminate(value.toBoolean(exec)); } -void setJSHTMLInputElementSelectionStart(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementSelectionStart(ExecState* exec, JSObject* thisObject, JSValue value) { - HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); - imp->setSelectionStart(value->toInt32(exec)); + static_cast<JSHTMLInputElement*>(thisObject)->setSelectionStart(exec, value); } -void setJSHTMLInputElementSelectionEnd(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLInputElementSelectionEnd(ExecState* exec, JSObject* thisObject, JSValue value) { - HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); - imp->setSelectionEnd(value->toInt32(exec)); + static_cast<JSHTMLInputElement*>(thisObject)->setSelectionEnd(exec, value); } -JSValuePtr JSHTMLInputElement::getConstructor(ExecState* exec) +JSValue JSHTMLInputElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLInputElementConstructor>(exec); } -JSValuePtr jsHTMLInputElementPrototypeFunctionSelect(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLInputElementPrototypeFunctionSelect(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLInputElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLInputElement::s_info)) return throwError(exec, TypeError); JSHTMLInputElement* castedThisObj = static_cast<JSHTMLInputElement*>(asObject(thisValue)); HTMLInputElement* imp = static_cast<HTMLInputElement*>(castedThisObj->impl()); @@ -446,9 +490,10 @@ JSValuePtr jsHTMLInputElementPrototypeFunctionSelect(ExecState* exec, JSObject*, return jsUndefined(); } -JSValuePtr jsHTMLInputElementPrototypeFunctionClick(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLInputElementPrototypeFunctionClick(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLInputElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLInputElement::s_info)) return throwError(exec, TypeError); JSHTMLInputElement* castedThisObj = static_cast<JSHTMLInputElement*>(asObject(thisValue)); HTMLInputElement* imp = static_cast<HTMLInputElement*>(castedThisObj->impl()); @@ -457,17 +502,13 @@ JSValuePtr jsHTMLInputElementPrototypeFunctionClick(ExecState* exec, JSObject*, return jsUndefined(); } -JSValuePtr jsHTMLInputElementPrototypeFunctionSetSelectionRange(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLInputElementPrototypeFunctionSetSelectionRange(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLInputElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLInputElement::s_info)) return throwError(exec, TypeError); JSHTMLInputElement* castedThisObj = static_cast<JSHTMLInputElement*>(asObject(thisValue)); - HTMLInputElement* imp = static_cast<HTMLInputElement*>(castedThisObj->impl()); - int start = args.at(exec, 0)->toInt32(exec); - int end = args.at(exec, 1)->toInt32(exec); - - imp->setSelectionRange(start, end); - return jsUndefined(); + return castedThisObj->setSelectionRange(exec, args); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.h index 4722fe893f..ef9431c46b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.h @@ -31,33 +31,39 @@ class JSHTMLInputElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLInputElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLInputElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - bool customGetOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom attributes - JSC::JSValuePtr selectionStart(JSC::ExecState*) const; - JSC::JSValuePtr selectionEnd(JSC::ExecState*) const; + JSC::JSValue type(JSC::ExecState*) const; + JSC::JSValue selectionStart(JSC::ExecState*) const; + void setSelectionStart(JSC::ExecState*, JSC::JSValue); + JSC::JSValue selectionEnd(JSC::ExecState*) const; + void setSelectionEnd(JSC::ExecState*, JSC::JSValue); + + // Custom functions + JSC::JSValue setSelectionRange(JSC::ExecState*, const JSC::ArgList&); }; class JSHTMLInputElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -66,55 +72,59 @@ public: // Functions -JSC::JSValuePtr jsHTMLInputElementPrototypeFunctionSelect(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLInputElementPrototypeFunctionClick(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLInputElementPrototypeFunctionSetSelectionRange(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLInputElementPrototypeFunctionSelect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLInputElementPrototypeFunctionClick(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLInputElementPrototypeFunctionSetSelectionRange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLInputElementDefaultValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementDefaultValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementDefaultChecked(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementDefaultChecked(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLInputElementAccept(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementAccept(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementAccessKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementAccessKey(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementAlt(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementAlt(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementChecked(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementChecked(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementAutofocus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementAutofocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementMaxLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementMaxLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementReadOnly(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementReadOnly(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementSize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementSize(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementSrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementUseMap(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementUseMap(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementWillValidate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLInputElementIndeterminate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementIndeterminate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementSelectionStart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementSelectionStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementSelectionEnd(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLInputElementSelectionEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLInputElementFiles(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLInputElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLInputElementDefaultValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementDefaultValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementDefaultChecked(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementDefaultChecked(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLInputElementAccept(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementAccept(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementAccessKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementAccessKey(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementAlt(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementAlt(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementChecked(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementChecked(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementAutofocus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementAutofocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementMaxLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementMaxLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementMultiple(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementMultiple(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementPlaceholder(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementPlaceholder(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementReadOnly(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementReadOnly(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementSize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementSize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementSrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementUseMap(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementUseMap(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementWillValidate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLInputElementIndeterminate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementIndeterminate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementSelectionStart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementSelectionStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementSelectionEnd(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementSelectionEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementFiles(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLInputElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLIsIndexElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLIsIndexElement.cpp index 2c1aec018d..f8dee4f3df 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLIsIndexElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLIsIndexElement.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLIsIndexElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLIsIndexElement); /* Hash table */ @@ -74,13 +74,13 @@ public: JSHTMLIsIndexElementConstructor(ExecState* exec) : DOMObject(JSHTMLIsIndexElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLIsIndexElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLIsIndexElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -109,9 +109,9 @@ static const HashTable JSHTMLIsIndexElementPrototypeTable = const ClassInfo JSHTMLIsIndexElementPrototype::s_info = { "HTMLIsIndexElementPrototype", 0, &JSHTMLIsIndexElementPrototypeTable, 0 }; -JSObject* JSHTMLIsIndexElementPrototype::self(ExecState* exec) +JSObject* JSHTMLIsIndexElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLIsIndexElement>(exec); + return getDOMPrototype<JSHTMLIsIndexElement>(exec, globalObject); } const ClassInfo JSHTMLIsIndexElement::s_info = { "HTMLIsIndexElement", &JSHTMLInputElement::s_info, &JSHTMLIsIndexElementTable, 0 }; @@ -121,9 +121,9 @@ JSHTMLIsIndexElement::JSHTMLIsIndexElement(PassRefPtr<Structure> structure, Pass { } -JSObject* JSHTMLIsIndexElement::createPrototype(ExecState* exec) +JSObject* JSHTMLIsIndexElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLIsIndexElementPrototype(JSHTMLIsIndexElementPrototype::createStructure(JSHTMLInputElementPrototype::self(exec))); + return new (exec) JSHTMLIsIndexElementPrototype(JSHTMLIsIndexElementPrototype::createStructure(JSHTMLInputElementPrototype::self(exec, globalObject))); } bool JSHTMLIsIndexElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -131,34 +131,36 @@ bool JSHTMLIsIndexElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSHTMLIsIndexElement, Base>(exec, &JSHTMLIsIndexElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLIsIndexElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLIsIndexElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLIsIndexElement* imp = static_cast<HTMLIsIndexElement*>(static_cast<JSHTMLIsIndexElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->form())); } -JSValuePtr jsHTMLIsIndexElementPrompt(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLIsIndexElementPrompt(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLIsIndexElement* imp = static_cast<HTMLIsIndexElement*>(static_cast<JSHTMLIsIndexElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->prompt()); } -JSValuePtr jsHTMLIsIndexElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLIsIndexElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLIsIndexElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLIsIndexElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLIsIndexElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLIsIndexElement, Base>(exec, propertyName, value, &JSHTMLIsIndexElementTable, this, slot); } -void setJSHTMLIsIndexElementPrompt(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLIsIndexElementPrompt(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLIsIndexElement* imp = static_cast<HTMLIsIndexElement*>(static_cast<JSHTMLIsIndexElement*>(thisObject)->impl()); imp->setPrompt(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLIsIndexElement::getConstructor(ExecState* exec) +JSValue JSHTMLIsIndexElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLIsIndexElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLIsIndexElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLIsIndexElement.h index a75c4d4656..a4a3363c27 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLIsIndexElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLIsIndexElement.h @@ -31,24 +31,25 @@ class JSHTMLIsIndexElement : public JSHTMLInputElement { typedef JSHTMLInputElement Base; public: JSHTMLIsIndexElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLIsIndexElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLIsIndexElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLIsIndexElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,10 +57,10 @@ public: // Attributes -JSC::JSValuePtr jsHTMLIsIndexElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLIsIndexElementPrompt(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLIsIndexElementPrompt(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLIsIndexElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLIsIndexElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLIsIndexElementPrompt(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLIsIndexElementPrompt(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLIsIndexElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLLIElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLLIElement.cpp index f316107cef..8d3a2b834a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLLIElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLLIElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLLIElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLLIElement); /* Hash table */ @@ -72,13 +72,13 @@ public: JSHTMLLIElementConstructor(ExecState* exec) : DOMObject(JSHTMLLIElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLLIElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLLIElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -107,9 +107,9 @@ static const HashTable JSHTMLLIElementPrototypeTable = const ClassInfo JSHTMLLIElementPrototype::s_info = { "HTMLLIElementPrototype", 0, &JSHTMLLIElementPrototypeTable, 0 }; -JSObject* JSHTMLLIElementPrototype::self(ExecState* exec) +JSObject* JSHTMLLIElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLLIElement>(exec); + return getDOMPrototype<JSHTMLLIElement>(exec, globalObject); } const ClassInfo JSHTMLLIElement::s_info = { "HTMLLIElement", &JSHTMLElement::s_info, &JSHTMLLIElementTable, 0 }; @@ -119,9 +119,9 @@ JSHTMLLIElement::JSHTMLLIElement(PassRefPtr<Structure> structure, PassRefPtr<HTM { } -JSObject* JSHTMLLIElement::createPrototype(ExecState* exec) +JSObject* JSHTMLLIElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLLIElementPrototype(JSHTMLLIElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLLIElementPrototype(JSHTMLLIElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLLIElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -129,40 +129,42 @@ bool JSHTMLLIElement::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSHTMLLIElement, Base>(exec, &JSHTMLLIElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLLIElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLIElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLIElement* imp = static_cast<HTMLLIElement*>(static_cast<JSHTMLLIElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsHTMLLIElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLIElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLIElement* imp = static_cast<HTMLLIElement*>(static_cast<JSHTMLLIElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->value()); } -JSValuePtr jsHTMLLIElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLIElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLLIElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLLIElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLLIElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLLIElement, Base>(exec, propertyName, value, &JSHTMLLIElementTable, this, slot); } -void setJSHTMLLIElementType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLLIElementType(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLLIElement* imp = static_cast<HTMLLIElement*>(static_cast<JSHTMLLIElement*>(thisObject)->impl()); imp->setType(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLLIElementValue(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLLIElementValue(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLLIElement* imp = static_cast<HTMLLIElement*>(static_cast<JSHTMLLIElement*>(thisObject)->impl()); - imp->setValue(value->toInt32(exec)); + imp->setValue(value.toInt32(exec)); } -JSValuePtr JSHTMLLIElement::getConstructor(ExecState* exec) +JSValue JSHTMLLIElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLLIElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLLIElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLLIElement.h index 2d592ad1ab..1c3ffcd2f2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLLIElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLLIElement.h @@ -31,24 +31,25 @@ class JSHTMLLIElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLLIElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLLIElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLLIElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLLIElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,11 +57,11 @@ public: // Attributes -JSC::JSValuePtr jsHTMLLIElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLLIElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLLIElementValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLLIElementValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLLIElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLLIElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLLIElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLLIElementValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLLIElementValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLLIElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLLabelElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLLabelElement.cpp index e646dc09bc..90a93b37d6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLLabelElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLLabelElement.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLLabelElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLLabelElement); /* Hash table */ @@ -75,13 +75,13 @@ public: JSHTMLLabelElementConstructor(ExecState* exec) : DOMObject(JSHTMLLabelElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLLabelElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLLabelElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -110,9 +110,9 @@ static const HashTable JSHTMLLabelElementPrototypeTable = const ClassInfo JSHTMLLabelElementPrototype::s_info = { "HTMLLabelElementPrototype", 0, &JSHTMLLabelElementPrototypeTable, 0 }; -JSObject* JSHTMLLabelElementPrototype::self(ExecState* exec) +JSObject* JSHTMLLabelElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLLabelElement>(exec); + return getDOMPrototype<JSHTMLLabelElement>(exec, globalObject); } const ClassInfo JSHTMLLabelElement::s_info = { "HTMLLabelElement", &JSHTMLElement::s_info, &JSHTMLLabelElementTable, 0 }; @@ -122,9 +122,9 @@ JSHTMLLabelElement::JSHTMLLabelElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSHTMLLabelElement::createPrototype(ExecState* exec) +JSObject* JSHTMLLabelElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLLabelElementPrototype(JSHTMLLabelElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLLabelElementPrototype(JSHTMLLabelElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLLabelElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -132,46 +132,49 @@ bool JSHTMLLabelElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSHTMLLabelElement, Base>(exec, &JSHTMLLabelElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLLabelElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLabelElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLabelElement* imp = static_cast<HTMLLabelElement*>(static_cast<JSHTMLLabelElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->form())); } -JSValuePtr jsHTMLLabelElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLabelElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLabelElement* imp = static_cast<HTMLLabelElement*>(static_cast<JSHTMLLabelElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->accessKey()); } -JSValuePtr jsHTMLLabelElementHtmlFor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLabelElementHtmlFor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLabelElement* imp = static_cast<HTMLLabelElement*>(static_cast<JSHTMLLabelElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->htmlFor()); } -JSValuePtr jsHTMLLabelElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLabelElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLLabelElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLLabelElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLLabelElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLLabelElement, Base>(exec, propertyName, value, &JSHTMLLabelElementTable, this, slot); } -void setJSHTMLLabelElementAccessKey(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLLabelElementAccessKey(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLLabelElement* imp = static_cast<HTMLLabelElement*>(static_cast<JSHTMLLabelElement*>(thisObject)->impl()); imp->setAccessKey(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLLabelElementHtmlFor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLLabelElementHtmlFor(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLLabelElement* imp = static_cast<HTMLLabelElement*>(static_cast<JSHTMLLabelElement*>(thisObject)->impl()); imp->setHtmlFor(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLLabelElement::getConstructor(ExecState* exec) +JSValue JSHTMLLabelElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLLabelElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLLabelElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLLabelElement.h index 63e96cb931..32eb0569be 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLLabelElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLLabelElement.h @@ -31,24 +31,25 @@ class JSHTMLLabelElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLLabelElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLLabelElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLLabelElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLLabelElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,12 +57,12 @@ public: // Attributes -JSC::JSValuePtr jsHTMLLabelElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLLabelElementAccessKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLLabelElementAccessKey(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLLabelElementHtmlFor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLLabelElementHtmlFor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLLabelElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLLabelElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLLabelElementAccessKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLLabelElementAccessKey(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLLabelElementHtmlFor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLLabelElementHtmlFor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLLabelElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLLegendElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLLegendElement.cpp index 55d7ffee6b..73dcc8a5b2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLLegendElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLLegendElement.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLLegendElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLLegendElement); /* Hash table */ @@ -75,13 +75,13 @@ public: JSHTMLLegendElementConstructor(ExecState* exec) : DOMObject(JSHTMLLegendElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLLegendElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLLegendElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -110,9 +110,9 @@ static const HashTable JSHTMLLegendElementPrototypeTable = const ClassInfo JSHTMLLegendElementPrototype::s_info = { "HTMLLegendElementPrototype", 0, &JSHTMLLegendElementPrototypeTable, 0 }; -JSObject* JSHTMLLegendElementPrototype::self(ExecState* exec) +JSObject* JSHTMLLegendElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLLegendElement>(exec); + return getDOMPrototype<JSHTMLLegendElement>(exec, globalObject); } const ClassInfo JSHTMLLegendElement::s_info = { "HTMLLegendElement", &JSHTMLElement::s_info, &JSHTMLLegendElementTable, 0 }; @@ -122,9 +122,9 @@ JSHTMLLegendElement::JSHTMLLegendElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSHTMLLegendElement::createPrototype(ExecState* exec) +JSObject* JSHTMLLegendElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLLegendElementPrototype(JSHTMLLegendElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLLegendElementPrototype(JSHTMLLegendElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLLegendElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -132,46 +132,49 @@ bool JSHTMLLegendElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSHTMLLegendElement, Base>(exec, &JSHTMLLegendElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLLegendElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLegendElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLegendElement* imp = static_cast<HTMLLegendElement*>(static_cast<JSHTMLLegendElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->form())); } -JSValuePtr jsHTMLLegendElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLegendElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLegendElement* imp = static_cast<HTMLLegendElement*>(static_cast<JSHTMLLegendElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->accessKey()); } -JSValuePtr jsHTMLLegendElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLegendElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLegendElement* imp = static_cast<HTMLLegendElement*>(static_cast<JSHTMLLegendElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLLegendElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLegendElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLLegendElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLLegendElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLLegendElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLLegendElement, Base>(exec, propertyName, value, &JSHTMLLegendElementTable, this, slot); } -void setJSHTMLLegendElementAccessKey(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLLegendElementAccessKey(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLLegendElement* imp = static_cast<HTMLLegendElement*>(static_cast<JSHTMLLegendElement*>(thisObject)->impl()); imp->setAccessKey(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLLegendElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLLegendElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLLegendElement* imp = static_cast<HTMLLegendElement*>(static_cast<JSHTMLLegendElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLLegendElement::getConstructor(ExecState* exec) +JSValue JSHTMLLegendElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLLegendElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLLegendElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLLegendElement.h index 76c0f19380..9f0b2c2ca6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLLegendElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLLegendElement.h @@ -31,24 +31,25 @@ class JSHTMLLegendElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLLegendElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLLegendElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLLegendElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLLegendElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,12 +57,12 @@ public: // Attributes -JSC::JSValuePtr jsHTMLLegendElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLLegendElementAccessKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLLegendElementAccessKey(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLLegendElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLLegendElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLLegendElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLLegendElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLLegendElementAccessKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLLegendElementAccessKey(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLLegendElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLLegendElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLLegendElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLLinkElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLLinkElement.cpp index a5527714ee..237769d6c4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLLinkElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLLinkElement.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLLinkElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLLinkElement); /* Hash table */ @@ -82,13 +82,13 @@ public: JSHTMLLinkElementConstructor(ExecState* exec) : DOMObject(JSHTMLLinkElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLLinkElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLLinkElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -117,9 +117,9 @@ static const HashTable JSHTMLLinkElementPrototypeTable = const ClassInfo JSHTMLLinkElementPrototype::s_info = { "HTMLLinkElementPrototype", 0, &JSHTMLLinkElementPrototypeTable, 0 }; -JSObject* JSHTMLLinkElementPrototype::self(ExecState* exec) +JSObject* JSHTMLLinkElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLLinkElement>(exec); + return getDOMPrototype<JSHTMLLinkElement>(exec, globalObject); } const ClassInfo JSHTMLLinkElement::s_info = { "HTMLLinkElement", &JSHTMLElement::s_info, &JSHTMLLinkElementTable, 0 }; @@ -129,9 +129,9 @@ JSHTMLLinkElement::JSHTMLLinkElement(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSHTMLLinkElement::createPrototype(ExecState* exec) +JSObject* JSHTMLLinkElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLLinkElementPrototype(JSHTMLLinkElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLLinkElementPrototype(JSHTMLLinkElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLLinkElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -139,130 +139,140 @@ bool JSHTMLLinkElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSHTMLLinkElement, Base>(exec, &JSHTMLLinkElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLLinkElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLinkElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->disabled()); } -JSValuePtr jsHTMLLinkElementCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLinkElementCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->charset()); } -JSValuePtr jsHTMLLinkElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLinkElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->href()); } -JSValuePtr jsHTMLLinkElementHreflang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLinkElementHreflang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->hreflang()); } -JSValuePtr jsHTMLLinkElementMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLinkElementMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->media()); } -JSValuePtr jsHTMLLinkElementRel(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLinkElementRel(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->rel()); } -JSValuePtr jsHTMLLinkElementRev(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLinkElementRev(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->rev()); } -JSValuePtr jsHTMLLinkElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLinkElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->target()); } -JSValuePtr jsHTMLLinkElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLinkElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsHTMLLinkElementSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLinkElementSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->sheet())); } -JSValuePtr jsHTMLLinkElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLLinkElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLLinkElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLLinkElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLLinkElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLLinkElement, Base>(exec, propertyName, value, &JSHTMLLinkElementTable, this, slot); } -void setJSHTMLLinkElementDisabled(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLLinkElementDisabled(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(thisObject)->impl()); - imp->setDisabled(value->toBoolean(exec)); + imp->setDisabled(value.toBoolean(exec)); } -void setJSHTMLLinkElementCharset(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLLinkElementCharset(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(thisObject)->impl()); imp->setCharset(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLLinkElementHref(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLLinkElementHref(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(thisObject)->impl()); imp->setHref(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLLinkElementHreflang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLLinkElementHreflang(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(thisObject)->impl()); imp->setHreflang(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLLinkElementMedia(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLLinkElementMedia(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(thisObject)->impl()); imp->setMedia(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLLinkElementRel(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLLinkElementRel(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(thisObject)->impl()); imp->setRel(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLLinkElementRev(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLLinkElementRev(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(thisObject)->impl()); imp->setRev(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLLinkElementTarget(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLLinkElementTarget(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(thisObject)->impl()); imp->setTarget(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLLinkElementType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLLinkElementType(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLLinkElement* imp = static_cast<HTMLLinkElement*>(static_cast<JSHTMLLinkElement*>(thisObject)->impl()); imp->setType(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLLinkElement::getConstructor(ExecState* exec) +JSValue JSHTMLLinkElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLLinkElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLLinkElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLLinkElement.h index 36c9954129..d1bb4de458 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLLinkElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLLinkElement.h @@ -31,24 +31,25 @@ class JSHTMLLinkElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLLinkElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLLinkElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLLinkElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLLinkElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,26 +57,26 @@ public: // Attributes -JSC::JSValuePtr jsHTMLLinkElementDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLLinkElementDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLLinkElementCharset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLLinkElementCharset(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLLinkElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLLinkElementHref(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLLinkElementHreflang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLLinkElementHreflang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLLinkElementMedia(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLLinkElementMedia(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLLinkElementRel(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLLinkElementRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLLinkElementRev(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLLinkElementRev(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLLinkElementTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLLinkElementTarget(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLLinkElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLLinkElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLLinkElementSheet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLLinkElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLLinkElementDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLLinkElementDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLLinkElementCharset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLLinkElementCharset(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLLinkElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLLinkElementHref(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLLinkElementHreflang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLLinkElementHreflang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLLinkElementMedia(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLLinkElementMedia(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLLinkElementRel(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLLinkElementRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLLinkElementRev(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLLinkElementRev(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLLinkElementTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLLinkElementTarget(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLLinkElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLLinkElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLLinkElementSheet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLLinkElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMapElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLMapElement.cpp index 928fbb6fea..9fa0d2f87d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMapElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMapElement.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLMapElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLMapElement); /* Hash table */ @@ -74,13 +74,13 @@ public: JSHTMLMapElementConstructor(ExecState* exec) : DOMObject(JSHTMLMapElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLMapElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLMapElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -109,9 +109,9 @@ static const HashTable JSHTMLMapElementPrototypeTable = const ClassInfo JSHTMLMapElementPrototype::s_info = { "HTMLMapElementPrototype", 0, &JSHTMLMapElementPrototypeTable, 0 }; -JSObject* JSHTMLMapElementPrototype::self(ExecState* exec) +JSObject* JSHTMLMapElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLMapElement>(exec); + return getDOMPrototype<JSHTMLMapElement>(exec, globalObject); } const ClassInfo JSHTMLMapElement::s_info = { "HTMLMapElement", &JSHTMLElement::s_info, &JSHTMLMapElementTable, 0 }; @@ -121,9 +121,9 @@ JSHTMLMapElement::JSHTMLMapElement(PassRefPtr<Structure> structure, PassRefPtr<H { } -JSObject* JSHTMLMapElement::createPrototype(ExecState* exec) +JSObject* JSHTMLMapElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLMapElementPrototype(JSHTMLMapElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLMapElementPrototype(JSHTMLMapElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLMapElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -131,34 +131,36 @@ bool JSHTMLMapElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSHTMLMapElement, Base>(exec, &JSHTMLMapElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLMapElementAreas(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMapElementAreas(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMapElement* imp = static_cast<HTMLMapElement*>(static_cast<JSHTMLMapElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->areas())); } -JSValuePtr jsHTMLMapElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMapElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMapElement* imp = static_cast<HTMLMapElement*>(static_cast<JSHTMLMapElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsHTMLMapElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMapElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLMapElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLMapElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLMapElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLMapElement, Base>(exec, propertyName, value, &JSHTMLMapElementTable, this, slot); } -void setJSHTMLMapElementName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLMapElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLMapElement* imp = static_cast<HTMLMapElement*>(static_cast<JSHTMLMapElement*>(thisObject)->impl()); imp->setName(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLMapElement::getConstructor(ExecState* exec) +JSValue JSHTMLMapElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLMapElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMapElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLMapElement.h index 0d3ec3227a..8476c3a662 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMapElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMapElement.h @@ -31,24 +31,25 @@ class JSHTMLMapElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLMapElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLMapElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLMapElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLMapElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,10 +57,10 @@ public: // Attributes -JSC::JSValuePtr jsHTMLMapElementAreas(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMapElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMapElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMapElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMapElementAreas(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMapElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLMapElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLMapElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMarqueeElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLMarqueeElement.cpp index ef45746bba..faa05e0e08 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMarqueeElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMarqueeElement.cpp @@ -33,7 +33,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLMarqueeElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLMarqueeElement); /* Hash table */ @@ -69,13 +69,13 @@ public: JSHTMLMarqueeElementConstructor(ExecState* exec) : DOMObject(JSHTMLMarqueeElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLMarqueeElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLMarqueeElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -106,9 +106,9 @@ static const HashTable JSHTMLMarqueeElementPrototypeTable = const ClassInfo JSHTMLMarqueeElementPrototype::s_info = { "HTMLMarqueeElementPrototype", 0, &JSHTMLMarqueeElementPrototypeTable, 0 }; -JSObject* JSHTMLMarqueeElementPrototype::self(ExecState* exec) +JSObject* JSHTMLMarqueeElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLMarqueeElement>(exec); + return getDOMPrototype<JSHTMLMarqueeElement>(exec, globalObject); } bool JSHTMLMarqueeElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -123,9 +123,9 @@ JSHTMLMarqueeElement::JSHTMLMarqueeElement(PassRefPtr<Structure> structure, Pass { } -JSObject* JSHTMLMarqueeElement::createPrototype(ExecState* exec) +JSObject* JSHTMLMarqueeElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLMarqueeElementPrototype(JSHTMLMarqueeElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLMarqueeElementPrototype(JSHTMLMarqueeElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLMarqueeElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -133,18 +133,19 @@ bool JSHTMLMarqueeElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSHTMLMarqueeElement, Base>(exec, &JSHTMLMarqueeElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLMarqueeElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMarqueeElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLMarqueeElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSHTMLMarqueeElement::getConstructor(ExecState* exec) +JSValue JSHTMLMarqueeElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLMarqueeElementConstructor>(exec); } -JSValuePtr jsHTMLMarqueeElementPrototypeFunctionStart(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLMarqueeElementPrototypeFunctionStart(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLMarqueeElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLMarqueeElement::s_info)) return throwError(exec, TypeError); JSHTMLMarqueeElement* castedThisObj = static_cast<JSHTMLMarqueeElement*>(asObject(thisValue)); HTMLMarqueeElement* imp = static_cast<HTMLMarqueeElement*>(castedThisObj->impl()); @@ -153,9 +154,10 @@ JSValuePtr jsHTMLMarqueeElementPrototypeFunctionStart(ExecState* exec, JSObject* return jsUndefined(); } -JSValuePtr jsHTMLMarqueeElementPrototypeFunctionStop(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLMarqueeElementPrototypeFunctionStop(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLMarqueeElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLMarqueeElement::s_info)) return throwError(exec, TypeError); JSHTMLMarqueeElement* castedThisObj = static_cast<JSHTMLMarqueeElement*>(asObject(thisValue)); HTMLMarqueeElement* imp = static_cast<HTMLMarqueeElement*>(castedThisObj->impl()); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMarqueeElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLMarqueeElement.h index 3882a3bb45..238b8d34ed 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMarqueeElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMarqueeElement.h @@ -31,27 +31,28 @@ class JSHTMLMarqueeElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLMarqueeElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLMarqueeElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLMarqueeElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,11 +61,11 @@ public: // Functions -JSC::JSValuePtr jsHTMLMarqueeElementPrototypeFunctionStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLMarqueeElementPrototypeFunctionStop(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLMarqueeElementPrototypeFunctionStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLMarqueeElementPrototypeFunctionStop(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLMarqueeElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMarqueeElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMediaElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLMediaElement.cpp index 765dea8a29..5f435f7b2a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMediaElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMediaElement.cpp @@ -42,21 +42,22 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLMediaElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLMediaElement); /* Hash table */ -static const HashTableValue JSHTMLMediaElementTableValues[28] = +static const HashTableValue JSHTMLMediaElementTableValues[24] = { { "error", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementError, (intptr_t)0 }, { "src", DontDelete, (intptr_t)jsHTMLMediaElementSrc, (intptr_t)setJSHTMLMediaElementSrc }, { "currentSrc", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementCurrentSrc, (intptr_t)0 }, { "networkState", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementNetworkState, (intptr_t)0 }, - { "bufferingRate", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementBufferingRate, (intptr_t)0 }, + { "autobuffer", DontDelete, (intptr_t)jsHTMLMediaElementAutobuffer, (intptr_t)setJSHTMLMediaElementAutobuffer }, { "buffered", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementBuffered, (intptr_t)0 }, { "readyState", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementReadyState, (intptr_t)0 }, { "seeking", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementSeeking, (intptr_t)0 }, { "currentTime", DontDelete, (intptr_t)jsHTMLMediaElementCurrentTime, (intptr_t)setJSHTMLMediaElementCurrentTime }, + { "startTime", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementStartTime, (intptr_t)0 }, { "duration", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementDuration, (intptr_t)0 }, { "paused", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementPaused, (intptr_t)0 }, { "defaultPlaybackRate", DontDelete, (intptr_t)jsHTMLMediaElementDefaultPlaybackRate, (intptr_t)setJSHTMLMediaElementDefaultPlaybackRate }, @@ -65,12 +66,7 @@ static const HashTableValue JSHTMLMediaElementTableValues[28] = { "seekable", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementSeekable, (intptr_t)0 }, { "ended", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementEnded, (intptr_t)0 }, { "autoplay", DontDelete, (intptr_t)jsHTMLMediaElementAutoplay, (intptr_t)setJSHTMLMediaElementAutoplay }, - { "start", DontDelete, (intptr_t)jsHTMLMediaElementStart, (intptr_t)setJSHTMLMediaElementStart }, - { "end", DontDelete, (intptr_t)jsHTMLMediaElementEnd, (intptr_t)setJSHTMLMediaElementEnd }, - { "loopStart", DontDelete, (intptr_t)jsHTMLMediaElementLoopStart, (intptr_t)setJSHTMLMediaElementLoopStart }, - { "loopEnd", DontDelete, (intptr_t)jsHTMLMediaElementLoopEnd, (intptr_t)setJSHTMLMediaElementLoopEnd }, - { "playCount", DontDelete, (intptr_t)jsHTMLMediaElementPlayCount, (intptr_t)setJSHTMLMediaElementPlayCount }, - { "currentLoop", DontDelete, (intptr_t)jsHTMLMediaElementCurrentLoop, (intptr_t)setJSHTMLMediaElementCurrentLoop }, + { "loop", DontDelete, (intptr_t)jsHTMLMediaElementLoop, (intptr_t)setJSHTMLMediaElementLoop }, { "controls", DontDelete, (intptr_t)jsHTMLMediaElementControls, (intptr_t)setJSHTMLMediaElementControls }, { "volume", DontDelete, (intptr_t)jsHTMLMediaElementVolume, (intptr_t)setJSHTMLMediaElementVolume }, { "muted", DontDelete, (intptr_t)jsHTMLMediaElementMuted, (intptr_t)setJSHTMLMediaElementMuted }, @@ -80,24 +76,25 @@ static const HashTableValue JSHTMLMediaElementTableValues[28] = static const HashTable JSHTMLMediaElementTable = #if ENABLE(PERFECT_HASH_SIZE) - { 127, JSHTMLMediaElementTableValues, 0 }; + { 1023, JSHTMLMediaElementTableValues, 0 }; #else { 67, 63, JSHTMLMediaElementTableValues, 0 }; #endif /* Hash table for constructor */ -static const HashTableValue JSHTMLMediaElementConstructorTableValues[10] = -{ - { "EMPTY", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementEMPTY, (intptr_t)0 }, - { "LOADING", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementLOADING, (intptr_t)0 }, - { "LOADED_METADATA", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementLOADED_METADATA, (intptr_t)0 }, - { "LOADED_FIRST_FRAME", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementLOADED_FIRST_FRAME, (intptr_t)0 }, - { "LOADED", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementLOADED, (intptr_t)0 }, - { "DATA_UNAVAILABLE", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementDATA_UNAVAILABLE, (intptr_t)0 }, - { "CAN_SHOW_CURRENT_FRAME", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementCAN_SHOW_CURRENT_FRAME, (intptr_t)0 }, - { "CAN_PLAY", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementCAN_PLAY, (intptr_t)0 }, - { "CAN_PLAY_THROUGH", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementCAN_PLAY_THROUGH, (intptr_t)0 }, +static const HashTableValue JSHTMLMediaElementConstructorTableValues[11] = +{ + { "NETWORK_EMPTY", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementNETWORK_EMPTY, (intptr_t)0 }, + { "NETWORK_IDLE", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementNETWORK_IDLE, (intptr_t)0 }, + { "NETWORK_LOADING", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementNETWORK_LOADING, (intptr_t)0 }, + { "NETWORK_LOADED", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementNETWORK_LOADED, (intptr_t)0 }, + { "NETWORK_NO_SOURCE", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementNETWORK_NO_SOURCE, (intptr_t)0 }, + { "HAVE_NOTHING", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementHAVE_NOTHING, (intptr_t)0 }, + { "HAVE_METADATA", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementHAVE_METADATA, (intptr_t)0 }, + { "HAVE_CURRENT_DATA", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementHAVE_CURRENT_DATA, (intptr_t)0 }, + { "HAVE_FUTURE_DATA", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementHAVE_FUTURE_DATA, (intptr_t)0 }, + { "HAVE_ENOUGH_DATA", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementHAVE_ENOUGH_DATA, (intptr_t)0 }, { 0, 0, 0, 0 } }; @@ -113,13 +110,13 @@ public: JSHTMLMediaElementConstructor(ExecState* exec) : DOMObject(JSHTMLMediaElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLMediaElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLMediaElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -134,18 +131,20 @@ bool JSHTMLMediaElementConstructor::getOwnPropertySlot(ExecState* exec, const Id /* Hash table for prototype */ -static const HashTableValue JSHTMLMediaElementPrototypeTableValues[13] = -{ - { "EMPTY", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementEMPTY, (intptr_t)0 }, - { "LOADING", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementLOADING, (intptr_t)0 }, - { "LOADED_METADATA", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementLOADED_METADATA, (intptr_t)0 }, - { "LOADED_FIRST_FRAME", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementLOADED_FIRST_FRAME, (intptr_t)0 }, - { "LOADED", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementLOADED, (intptr_t)0 }, - { "DATA_UNAVAILABLE", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementDATA_UNAVAILABLE, (intptr_t)0 }, - { "CAN_SHOW_CURRENT_FRAME", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementCAN_SHOW_CURRENT_FRAME, (intptr_t)0 }, - { "CAN_PLAY", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementCAN_PLAY, (intptr_t)0 }, - { "CAN_PLAY_THROUGH", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementCAN_PLAY_THROUGH, (intptr_t)0 }, +static const HashTableValue JSHTMLMediaElementPrototypeTableValues[15] = +{ + { "NETWORK_EMPTY", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementNETWORK_EMPTY, (intptr_t)0 }, + { "NETWORK_IDLE", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementNETWORK_IDLE, (intptr_t)0 }, + { "NETWORK_LOADING", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementNETWORK_LOADING, (intptr_t)0 }, + { "NETWORK_LOADED", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementNETWORK_LOADED, (intptr_t)0 }, + { "NETWORK_NO_SOURCE", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementNETWORK_NO_SOURCE, (intptr_t)0 }, + { "HAVE_NOTHING", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementHAVE_NOTHING, (intptr_t)0 }, + { "HAVE_METADATA", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementHAVE_METADATA, (intptr_t)0 }, + { "HAVE_CURRENT_DATA", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementHAVE_CURRENT_DATA, (intptr_t)0 }, + { "HAVE_FUTURE_DATA", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementHAVE_FUTURE_DATA, (intptr_t)0 }, + { "HAVE_ENOUGH_DATA", DontDelete|ReadOnly, (intptr_t)jsHTMLMediaElementHAVE_ENOUGH_DATA, (intptr_t)0 }, { "load", DontDelete|Function, (intptr_t)jsHTMLMediaElementPrototypeFunctionLoad, (intptr_t)0 }, + { "canPlayType", DontDelete|Function, (intptr_t)jsHTMLMediaElementPrototypeFunctionCanPlayType, (intptr_t)1 }, { "play", DontDelete|Function, (intptr_t)jsHTMLMediaElementPrototypeFunctionPlay, (intptr_t)0 }, { "pause", DontDelete|Function, (intptr_t)jsHTMLMediaElementPrototypeFunctionPause, (intptr_t)0 }, { 0, 0, 0, 0 } @@ -153,16 +152,16 @@ static const HashTableValue JSHTMLMediaElementPrototypeTableValues[13] = static const HashTable JSHTMLMediaElementPrototypeTable = #if ENABLE(PERFECT_HASH_SIZE) - { 127, JSHTMLMediaElementPrototypeTableValues, 0 }; + { 63, JSHTMLMediaElementPrototypeTableValues, 0 }; #else - { 34, 31, JSHTMLMediaElementPrototypeTableValues, 0 }; + { 33, 31, JSHTMLMediaElementPrototypeTableValues, 0 }; #endif const ClassInfo JSHTMLMediaElementPrototype::s_info = { "HTMLMediaElementPrototype", 0, &JSHTMLMediaElementPrototypeTable, 0 }; -JSObject* JSHTMLMediaElementPrototype::self(ExecState* exec) +JSObject* JSHTMLMediaElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLMediaElement>(exec); + return getDOMPrototype<JSHTMLMediaElement>(exec, globalObject); } bool JSHTMLMediaElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -177,9 +176,9 @@ JSHTMLMediaElement::JSHTMLMediaElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSHTMLMediaElement::createPrototype(ExecState* exec) +JSObject* JSHTMLMediaElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLMediaElementPrototype(JSHTMLMediaElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLMediaElementPrototype(JSHTMLMediaElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLMediaElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -187,273 +186,242 @@ bool JSHTMLMediaElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSHTMLMediaElement, Base>(exec, &JSHTMLMediaElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLMediaElementError(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementError(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->error())); } -JSValuePtr jsHTMLMediaElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->src()); } -JSValuePtr jsHTMLMediaElementCurrentSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementCurrentSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->currentSrc()); } -JSValuePtr jsHTMLMediaElementNetworkState(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementNetworkState(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->networkState()); } -JSValuePtr jsHTMLMediaElementBufferingRate(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementAutobuffer(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->bufferingRate()); + return jsBoolean(imp->autobuffer()); } -JSValuePtr jsHTMLMediaElementBuffered(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementBuffered(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->buffered())); } -JSValuePtr jsHTMLMediaElementReadyState(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementReadyState(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->readyState()); } -JSValuePtr jsHTMLMediaElementSeeking(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementSeeking(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->seeking()); } -JSValuePtr jsHTMLMediaElementCurrentTime(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementCurrentTime(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->currentTime()); } -JSValuePtr jsHTMLMediaElementDuration(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementStartTime(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); + HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->startTime()); +} + +JSValue jsHTMLMediaElementDuration(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->duration()); } -JSValuePtr jsHTMLMediaElementPaused(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementPaused(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->paused()); } -JSValuePtr jsHTMLMediaElementDefaultPlaybackRate(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementDefaultPlaybackRate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->defaultPlaybackRate()); } -JSValuePtr jsHTMLMediaElementPlaybackRate(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementPlaybackRate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->playbackRate()); } -JSValuePtr jsHTMLMediaElementPlayed(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementPlayed(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->played())); } -JSValuePtr jsHTMLMediaElementSeekable(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementSeekable(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->seekable())); } -JSValuePtr jsHTMLMediaElementEnded(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementEnded(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->ended()); } -JSValuePtr jsHTMLMediaElementAutoplay(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementAutoplay(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->autoplay()); } -JSValuePtr jsHTMLMediaElementStart(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->start()); -} - -JSValuePtr jsHTMLMediaElementEnd(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->end()); -} - -JSValuePtr jsHTMLMediaElementLoopStart(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->loopStart()); -} - -JSValuePtr jsHTMLMediaElementLoopEnd(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementLoop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->loopEnd()); + return jsBoolean(imp->loop()); } -JSValuePtr jsHTMLMediaElementPlayCount(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->playCount()); -} - -JSValuePtr jsHTMLMediaElementCurrentLoop(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); - return jsNumber(exec, imp->currentLoop()); -} - -JSValuePtr jsHTMLMediaElementControls(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementControls(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->controls()); } -JSValuePtr jsHTMLMediaElementVolume(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementVolume(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->volume()); } -JSValuePtr jsHTMLMediaElementMuted(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementMuted(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->muted()); } -JSValuePtr jsHTMLMediaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMediaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLMediaElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLMediaElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLMediaElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLMediaElement, Base>(exec, propertyName, value, &JSHTMLMediaElementTable, this, slot); } -void setJSHTMLMediaElementSrc(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLMediaElementSrc(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(thisObject)->impl()); - imp->setSrc(value->toString(exec)); + imp->setSrc(value.toString(exec)); } -void setJSHTMLMediaElementCurrentTime(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLMediaElementAutobuffer(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(thisObject)->impl()); - ExceptionCode ec = 0; - imp->setCurrentTime(value->toFloat(exec), ec); - setDOMException(exec, ec); -} - -void setJSHTMLMediaElementDefaultPlaybackRate(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(thisObject)->impl()); - ExceptionCode ec = 0; - imp->setDefaultPlaybackRate(value->toFloat(exec), ec); - setDOMException(exec, ec); + imp->setAutobuffer(value.toBoolean(exec)); } -void setJSHTMLMediaElementPlaybackRate(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLMediaElementCurrentTime(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(thisObject)->impl()); ExceptionCode ec = 0; - imp->setPlaybackRate(value->toFloat(exec), ec); + imp->setCurrentTime(value.toFloat(exec), ec); setDOMException(exec, ec); } -void setJSHTMLMediaElementAutoplay(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(thisObject)->impl()); - imp->setAutoplay(value->toBoolean(exec)); -} - -void setJSHTMLMediaElementStart(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(thisObject)->impl()); - imp->setStart(value->toFloat(exec)); -} - -void setJSHTMLMediaElementEnd(ExecState* exec, JSObject* thisObject, JSValuePtr value) -{ - HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(thisObject)->impl()); - imp->setEnd(value->toFloat(exec)); -} - -void setJSHTMLMediaElementLoopStart(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLMediaElementDefaultPlaybackRate(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(thisObject)->impl()); - imp->setLoopStart(value->toFloat(exec)); + imp->setDefaultPlaybackRate(value.toFloat(exec)); } -void setJSHTMLMediaElementLoopEnd(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLMediaElementPlaybackRate(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(thisObject)->impl()); - imp->setLoopEnd(value->toFloat(exec)); + imp->setPlaybackRate(value.toFloat(exec)); } -void setJSHTMLMediaElementPlayCount(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLMediaElementAutoplay(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(thisObject)->impl()); - ExceptionCode ec = 0; - imp->setPlayCount(value->toInt32(exec), ec); - setDOMException(exec, ec); + imp->setAutoplay(value.toBoolean(exec)); } -void setJSHTMLMediaElementCurrentLoop(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLMediaElementLoop(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(thisObject)->impl()); - imp->setCurrentLoop(value->toInt32(exec)); + imp->setLoop(value.toBoolean(exec)); } -void setJSHTMLMediaElementControls(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLMediaElementControls(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(thisObject)->impl()); - imp->setControls(value->toBoolean(exec)); + imp->setControls(value.toBoolean(exec)); } -void setJSHTMLMediaElementVolume(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLMediaElementVolume(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(thisObject)->impl()); ExceptionCode ec = 0; - imp->setVolume(value->toFloat(exec), ec); + imp->setVolume(value.toFloat(exec), ec); setDOMException(exec, ec); } -void setJSHTMLMediaElementMuted(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLMediaElementMuted(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(static_cast<JSHTMLMediaElement*>(thisObject)->impl()); - imp->setMuted(value->toBoolean(exec)); + imp->setMuted(value.toBoolean(exec)); } -JSValuePtr JSHTMLMediaElement::getConstructor(ExecState* exec) +JSValue JSHTMLMediaElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLMediaElementConstructor>(exec); } -JSValuePtr jsHTMLMediaElementPrototypeFunctionLoad(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLMediaElementPrototypeFunctionLoad(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLMediaElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLMediaElement::s_info)) return throwError(exec, TypeError); JSHTMLMediaElement* castedThisObj = static_cast<JSHTMLMediaElement*>(asObject(thisValue)); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(castedThisObj->impl()); @@ -464,79 +432,96 @@ JSValuePtr jsHTMLMediaElementPrototypeFunctionLoad(ExecState* exec, JSObject*, J return jsUndefined(); } -JSValuePtr jsHTMLMediaElementPrototypeFunctionPlay(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLMediaElementPrototypeFunctionCanPlayType(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLMediaElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLMediaElement::s_info)) return throwError(exec, TypeError); JSHTMLMediaElement* castedThisObj = static_cast<JSHTMLMediaElement*>(asObject(thisValue)); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(castedThisObj->impl()); - ExceptionCode ec = 0; + const UString& type = args.at(0).toString(exec); - imp->play(ec); - setDOMException(exec, ec); + + JSC::JSValue result = jsString(exec, imp->canPlayType(type)); + return result; +} + +JSValue JSC_HOST_CALL jsHTMLMediaElementPrototypeFunctionPlay(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLMediaElement::s_info)) + return throwError(exec, TypeError); + JSHTMLMediaElement* castedThisObj = static_cast<JSHTMLMediaElement*>(asObject(thisValue)); + HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(castedThisObj->impl()); + + imp->play(); return jsUndefined(); } -JSValuePtr jsHTMLMediaElementPrototypeFunctionPause(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLMediaElementPrototypeFunctionPause(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLMediaElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLMediaElement::s_info)) return throwError(exec, TypeError); JSHTMLMediaElement* castedThisObj = static_cast<JSHTMLMediaElement*>(asObject(thisValue)); HTMLMediaElement* imp = static_cast<HTMLMediaElement*>(castedThisObj->impl()); - ExceptionCode ec = 0; - imp->pause(ec); - setDOMException(exec, ec); + imp->pause(); return jsUndefined(); } // Constant getters -JSValuePtr jsHTMLMediaElementEMPTY(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsHTMLMediaElementNETWORK_EMPTY(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsHTMLMediaElementLOADING(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsHTMLMediaElementNETWORK_IDLE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsHTMLMediaElementLOADED_METADATA(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsHTMLMediaElementNETWORK_LOADING(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsHTMLMediaElementLOADED_FIRST_FRAME(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsHTMLMediaElementNETWORK_LOADED(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsHTMLMediaElementLOADED(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsHTMLMediaElementNETWORK_NO_SOURCE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSValuePtr jsHTMLMediaElementDATA_UNAVAILABLE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsHTMLMediaElementHAVE_NOTHING(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsHTMLMediaElementCAN_SHOW_CURRENT_FRAME(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsHTMLMediaElementHAVE_METADATA(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsHTMLMediaElementCAN_PLAY(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsHTMLMediaElementHAVE_CURRENT_DATA(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsHTMLMediaElementCAN_PLAY_THROUGH(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsHTMLMediaElementHAVE_FUTURE_DATA(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } +JSValue jsHTMLMediaElementHAVE_ENOUGH_DATA(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(4)); +} + } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMediaElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLMediaElement.h index fbce2495d2..6ba7694d7d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMediaElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMediaElement.h @@ -34,28 +34,29 @@ class JSHTMLMediaElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLMediaElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLMediaElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLMediaElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -64,63 +65,57 @@ public: // Functions -JSC::JSValuePtr jsHTMLMediaElementPrototypeFunctionLoad(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLMediaElementPrototypeFunctionPlay(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLMediaElementPrototypeFunctionPause(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLMediaElementPrototypeFunctionLoad(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLMediaElementPrototypeFunctionCanPlayType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLMediaElementPrototypeFunctionPlay(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLMediaElementPrototypeFunctionPause(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLMediaElementError(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMediaElementSrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMediaElementCurrentSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementNetworkState(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementBufferingRate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementBuffered(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementReadyState(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementSeeking(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementCurrentTime(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMediaElementCurrentTime(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMediaElementDuration(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementPaused(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementDefaultPlaybackRate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMediaElementDefaultPlaybackRate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMediaElementPlaybackRate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMediaElementPlaybackRate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMediaElementPlayed(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementSeekable(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementEnded(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementAutoplay(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMediaElementAutoplay(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMediaElementStart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMediaElementStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMediaElementEnd(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMediaElementEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMediaElementLoopStart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMediaElementLoopStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMediaElementLoopEnd(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMediaElementLoopEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMediaElementPlayCount(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMediaElementPlayCount(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMediaElementCurrentLoop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMediaElementCurrentLoop(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMediaElementControls(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMediaElementControls(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMediaElementVolume(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMediaElementVolume(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMediaElementMuted(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMediaElementMuted(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMediaElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementError(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLMediaElementSrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLMediaElementCurrentSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementNetworkState(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementAutobuffer(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLMediaElementAutobuffer(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLMediaElementBuffered(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementReadyState(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementSeeking(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementCurrentTime(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLMediaElementCurrentTime(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLMediaElementStartTime(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementDuration(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementPaused(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementDefaultPlaybackRate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLMediaElementDefaultPlaybackRate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLMediaElementPlaybackRate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLMediaElementPlaybackRate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLMediaElementPlayed(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementSeekable(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementEnded(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementAutoplay(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLMediaElementAutoplay(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLMediaElementLoop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLMediaElementLoop(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLMediaElementControls(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLMediaElementControls(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLMediaElementVolume(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLMediaElementVolume(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLMediaElementMuted(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLMediaElementMuted(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLMediaElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsHTMLMediaElementEMPTY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementLOADING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementLOADED_METADATA(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementLOADED_FIRST_FRAME(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementLOADED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementDATA_UNAVAILABLE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementCAN_SHOW_CURRENT_FRAME(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementCAN_PLAY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLMediaElementCAN_PLAY_THROUGH(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementNETWORK_EMPTY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementNETWORK_IDLE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementNETWORK_LOADING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementNETWORK_LOADED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementNETWORK_NO_SOURCE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementHAVE_NOTHING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementHAVE_METADATA(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementHAVE_CURRENT_DATA(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementHAVE_FUTURE_DATA(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMediaElementHAVE_ENOUGH_DATA(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMenuElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLMenuElement.cpp index 3f947dc78f..f0ef5a0549 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMenuElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMenuElement.cpp @@ -32,7 +32,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLMenuElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLMenuElement); /* Hash table */ @@ -69,13 +69,13 @@ public: JSHTMLMenuElementConstructor(ExecState* exec) : DOMObject(JSHTMLMenuElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLMenuElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLMenuElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -104,9 +104,9 @@ static const HashTable JSHTMLMenuElementPrototypeTable = const ClassInfo JSHTMLMenuElementPrototype::s_info = { "HTMLMenuElementPrototype", 0, &JSHTMLMenuElementPrototypeTable, 0 }; -JSObject* JSHTMLMenuElementPrototype::self(ExecState* exec) +JSObject* JSHTMLMenuElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLMenuElement>(exec); + return getDOMPrototype<JSHTMLMenuElement>(exec, globalObject); } const ClassInfo JSHTMLMenuElement::s_info = { "HTMLMenuElement", &JSHTMLElement::s_info, &JSHTMLMenuElementTable, 0 }; @@ -116,9 +116,9 @@ JSHTMLMenuElement::JSHTMLMenuElement(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSHTMLMenuElement::createPrototype(ExecState* exec) +JSObject* JSHTMLMenuElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLMenuElementPrototype(JSHTMLMenuElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLMenuElementPrototype(JSHTMLMenuElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLMenuElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -126,28 +126,29 @@ bool JSHTMLMenuElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSHTMLMenuElement, Base>(exec, &JSHTMLMenuElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLMenuElementCompact(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMenuElementCompact(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMenuElement* imp = static_cast<HTMLMenuElement*>(static_cast<JSHTMLMenuElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->compact()); } -JSValuePtr jsHTMLMenuElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMenuElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLMenuElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLMenuElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLMenuElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLMenuElement, Base>(exec, propertyName, value, &JSHTMLMenuElementTable, this, slot); } -void setJSHTMLMenuElementCompact(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLMenuElementCompact(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLMenuElement* imp = static_cast<HTMLMenuElement*>(static_cast<JSHTMLMenuElement*>(thisObject)->impl()); - imp->setCompact(value->toBoolean(exec)); + imp->setCompact(value.toBoolean(exec)); } -JSValuePtr JSHTMLMenuElement::getConstructor(ExecState* exec) +JSValue JSHTMLMenuElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLMenuElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMenuElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLMenuElement.h index a08e739714..ca9321c191 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMenuElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMenuElement.h @@ -31,24 +31,25 @@ class JSHTMLMenuElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLMenuElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLMenuElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLMenuElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLMenuElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,9 +57,9 @@ public: // Attributes -JSC::JSValuePtr jsHTMLMenuElementCompact(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMenuElementCompact(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMenuElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMenuElementCompact(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLMenuElementCompact(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLMenuElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMetaElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLMetaElement.cpp index def9b39d13..26c4ed50c4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMetaElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMetaElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLMetaElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLMetaElement); /* Hash table */ @@ -74,13 +74,13 @@ public: JSHTMLMetaElementConstructor(ExecState* exec) : DOMObject(JSHTMLMetaElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLMetaElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLMetaElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -109,9 +109,9 @@ static const HashTable JSHTMLMetaElementPrototypeTable = const ClassInfo JSHTMLMetaElementPrototype::s_info = { "HTMLMetaElementPrototype", 0, &JSHTMLMetaElementPrototypeTable, 0 }; -JSObject* JSHTMLMetaElementPrototype::self(ExecState* exec) +JSObject* JSHTMLMetaElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLMetaElement>(exec); + return getDOMPrototype<JSHTMLMetaElement>(exec, globalObject); } const ClassInfo JSHTMLMetaElement::s_info = { "HTMLMetaElement", &JSHTMLElement::s_info, &JSHTMLMetaElementTable, 0 }; @@ -121,9 +121,9 @@ JSHTMLMetaElement::JSHTMLMetaElement(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSHTMLMetaElement::createPrototype(ExecState* exec) +JSObject* JSHTMLMetaElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLMetaElementPrototype(JSHTMLMetaElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLMetaElementPrototype(JSHTMLMetaElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLMetaElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -131,64 +131,68 @@ bool JSHTMLMetaElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSHTMLMetaElement, Base>(exec, &JSHTMLMetaElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLMetaElementContent(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMetaElementContent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMetaElement* imp = static_cast<HTMLMetaElement*>(static_cast<JSHTMLMetaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->content()); } -JSValuePtr jsHTMLMetaElementHttpEquiv(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMetaElementHttpEquiv(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMetaElement* imp = static_cast<HTMLMetaElement*>(static_cast<JSHTMLMetaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->httpEquiv()); } -JSValuePtr jsHTMLMetaElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMetaElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMetaElement* imp = static_cast<HTMLMetaElement*>(static_cast<JSHTMLMetaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsHTMLMetaElementScheme(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMetaElementScheme(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLMetaElement* imp = static_cast<HTMLMetaElement*>(static_cast<JSHTMLMetaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->scheme()); } -JSValuePtr jsHTMLMetaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLMetaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLMetaElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLMetaElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLMetaElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLMetaElement, Base>(exec, propertyName, value, &JSHTMLMetaElementTable, this, slot); } -void setJSHTMLMetaElementContent(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLMetaElementContent(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLMetaElement* imp = static_cast<HTMLMetaElement*>(static_cast<JSHTMLMetaElement*>(thisObject)->impl()); imp->setContent(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLMetaElementHttpEquiv(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLMetaElementHttpEquiv(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLMetaElement* imp = static_cast<HTMLMetaElement*>(static_cast<JSHTMLMetaElement*>(thisObject)->impl()); imp->setHttpEquiv(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLMetaElementName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLMetaElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLMetaElement* imp = static_cast<HTMLMetaElement*>(static_cast<JSHTMLMetaElement*>(thisObject)->impl()); imp->setName(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLMetaElementScheme(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLMetaElementScheme(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLMetaElement* imp = static_cast<HTMLMetaElement*>(static_cast<JSHTMLMetaElement*>(thisObject)->impl()); imp->setScheme(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLMetaElement::getConstructor(ExecState* exec) +JSValue JSHTMLMetaElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLMetaElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMetaElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLMetaElement.h index 0ad9bbe477..ee531c5d7d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMetaElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMetaElement.h @@ -31,24 +31,25 @@ class JSHTMLMetaElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLMetaElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLMetaElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLMetaElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLMetaElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,15 +57,15 @@ public: // Attributes -JSC::JSValuePtr jsHTMLMetaElementContent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMetaElementContent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMetaElementHttpEquiv(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMetaElementHttpEquiv(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMetaElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMetaElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMetaElementScheme(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLMetaElementScheme(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLMetaElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLMetaElementContent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLMetaElementContent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLMetaElementHttpEquiv(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLMetaElementHttpEquiv(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLMetaElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLMetaElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLMetaElementScheme(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLMetaElementScheme(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLMetaElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLModElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLModElement.cpp index fe159b6e77..7eff2e384e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLModElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLModElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLModElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLModElement); /* Hash table */ @@ -72,13 +72,13 @@ public: JSHTMLModElementConstructor(ExecState* exec) : DOMObject(JSHTMLModElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLModElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLModElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -107,9 +107,9 @@ static const HashTable JSHTMLModElementPrototypeTable = const ClassInfo JSHTMLModElementPrototype::s_info = { "HTMLModElementPrototype", 0, &JSHTMLModElementPrototypeTable, 0 }; -JSObject* JSHTMLModElementPrototype::self(ExecState* exec) +JSObject* JSHTMLModElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLModElement>(exec); + return getDOMPrototype<JSHTMLModElement>(exec, globalObject); } const ClassInfo JSHTMLModElement::s_info = { "HTMLModElement", &JSHTMLElement::s_info, &JSHTMLModElementTable, 0 }; @@ -119,9 +119,9 @@ JSHTMLModElement::JSHTMLModElement(PassRefPtr<Structure> structure, PassRefPtr<H { } -JSObject* JSHTMLModElement::createPrototype(ExecState* exec) +JSObject* JSHTMLModElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLModElementPrototype(JSHTMLModElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLModElementPrototype(JSHTMLModElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLModElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -129,40 +129,42 @@ bool JSHTMLModElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSHTMLModElement, Base>(exec, &JSHTMLModElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLModElementCite(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLModElementCite(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLModElement* imp = static_cast<HTMLModElement*>(static_cast<JSHTMLModElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->cite()); } -JSValuePtr jsHTMLModElementDateTime(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLModElementDateTime(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLModElement* imp = static_cast<HTMLModElement*>(static_cast<JSHTMLModElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->dateTime()); } -JSValuePtr jsHTMLModElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLModElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLModElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLModElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLModElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLModElement, Base>(exec, propertyName, value, &JSHTMLModElementTable, this, slot); } -void setJSHTMLModElementCite(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLModElementCite(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLModElement* imp = static_cast<HTMLModElement*>(static_cast<JSHTMLModElement*>(thisObject)->impl()); imp->setCite(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLModElementDateTime(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLModElementDateTime(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLModElement* imp = static_cast<HTMLModElement*>(static_cast<JSHTMLModElement*>(thisObject)->impl()); imp->setDateTime(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLModElement::getConstructor(ExecState* exec) +JSValue JSHTMLModElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLModElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLModElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLModElement.h index c39d1cb9b2..67b6e0236c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLModElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLModElement.h @@ -31,24 +31,25 @@ class JSHTMLModElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLModElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLModElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLModElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLModElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,11 +57,11 @@ public: // Attributes -JSC::JSValuePtr jsHTMLModElementCite(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLModElementCite(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLModElementDateTime(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLModElementDateTime(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLModElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLModElementCite(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLModElementCite(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLModElementDateTime(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLModElementDateTime(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLModElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOListElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLOListElement.cpp index b6d9cf835b..1f43d6d66a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOListElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOListElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLOListElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLOListElement); /* Hash table */ @@ -73,13 +73,13 @@ public: JSHTMLOListElementConstructor(ExecState* exec) : DOMObject(JSHTMLOListElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLOListElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLOListElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -108,9 +108,9 @@ static const HashTable JSHTMLOListElementPrototypeTable = const ClassInfo JSHTMLOListElementPrototype::s_info = { "HTMLOListElementPrototype", 0, &JSHTMLOListElementPrototypeTable, 0 }; -JSObject* JSHTMLOListElementPrototype::self(ExecState* exec) +JSObject* JSHTMLOListElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLOListElement>(exec); + return getDOMPrototype<JSHTMLOListElement>(exec, globalObject); } const ClassInfo JSHTMLOListElement::s_info = { "HTMLOListElement", &JSHTMLElement::s_info, &JSHTMLOListElementTable, 0 }; @@ -120,9 +120,9 @@ JSHTMLOListElement::JSHTMLOListElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSHTMLOListElement::createPrototype(ExecState* exec) +JSObject* JSHTMLOListElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLOListElementPrototype(JSHTMLOListElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLOListElementPrototype(JSHTMLOListElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLOListElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -130,52 +130,55 @@ bool JSHTMLOListElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSHTMLOListElement, Base>(exec, &JSHTMLOListElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLOListElementCompact(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOListElementCompact(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLOListElement* imp = static_cast<HTMLOListElement*>(static_cast<JSHTMLOListElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->compact()); } -JSValuePtr jsHTMLOListElementStart(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOListElementStart(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLOListElement* imp = static_cast<HTMLOListElement*>(static_cast<JSHTMLOListElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->start()); } -JSValuePtr jsHTMLOListElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOListElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLOListElement* imp = static_cast<HTMLOListElement*>(static_cast<JSHTMLOListElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsHTMLOListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLOListElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLOListElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLOListElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLOListElement, Base>(exec, propertyName, value, &JSHTMLOListElementTable, this, slot); } -void setJSHTMLOListElementCompact(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLOListElementCompact(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLOListElement* imp = static_cast<HTMLOListElement*>(static_cast<JSHTMLOListElement*>(thisObject)->impl()); - imp->setCompact(value->toBoolean(exec)); + imp->setCompact(value.toBoolean(exec)); } -void setJSHTMLOListElementStart(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLOListElementStart(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLOListElement* imp = static_cast<HTMLOListElement*>(static_cast<JSHTMLOListElement*>(thisObject)->impl()); - imp->setStart(value->toInt32(exec)); + imp->setStart(value.toInt32(exec)); } -void setJSHTMLOListElementType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLOListElementType(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLOListElement* imp = static_cast<HTMLOListElement*>(static_cast<JSHTMLOListElement*>(thisObject)->impl()); imp->setType(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLOListElement::getConstructor(ExecState* exec) +JSValue JSHTMLOListElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLOListElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOListElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLOListElement.h index d166da672f..e7cfac5386 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOListElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOListElement.h @@ -31,24 +31,25 @@ class JSHTMLOListElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLOListElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLOListElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLOListElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLOListElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,13 +57,13 @@ public: // Attributes -JSC::JSValuePtr jsHTMLOListElementCompact(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLOListElementCompact(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLOListElementStart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLOListElementStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLOListElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLOListElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLOListElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLOListElementCompact(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLOListElementCompact(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLOListElementStart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLOListElementStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLOListElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLOListElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLOListElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.cpp index 0233e5710a..e7e412963f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.cpp @@ -44,7 +44,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLObjectElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLObjectElement); /* Hash table */ @@ -98,13 +98,13 @@ public: JSHTMLObjectElementConstructor(ExecState* exec) : DOMObject(JSHTMLObjectElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLObjectElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLObjectElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -134,9 +134,9 @@ static const HashTable JSHTMLObjectElementPrototypeTable = const ClassInfo JSHTMLObjectElementPrototype::s_info = { "HTMLObjectElementPrototype", 0, &JSHTMLObjectElementPrototypeTable, 0 }; -JSObject* JSHTMLObjectElementPrototype::self(ExecState* exec) +JSObject* JSHTMLObjectElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLObjectElement>(exec); + return getDOMPrototype<JSHTMLObjectElement>(exec, globalObject); } bool JSHTMLObjectElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -151,9 +151,9 @@ JSHTMLObjectElement::JSHTMLObjectElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSHTMLObjectElement::createPrototype(ExecState* exec) +JSObject* JSHTMLObjectElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLObjectElementPrototype(JSHTMLObjectElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLObjectElementPrototype(JSHTMLObjectElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLObjectElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -167,229 +167,247 @@ bool JSHTMLObjectElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSHTMLObjectElement, Base>(exec, &JSHTMLObjectElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLObjectElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->form())); } -JSValuePtr jsHTMLObjectElementCode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->code()); } -JSValuePtr jsHTMLObjectElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLObjectElementArchive(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementArchive(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->archive()); } -JSValuePtr jsHTMLObjectElementBorder(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementBorder(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->border()); } -JSValuePtr jsHTMLObjectElementCodeBase(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementCodeBase(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->codeBase()); } -JSValuePtr jsHTMLObjectElementCodeType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementCodeType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->codeType()); } -JSValuePtr jsHTMLObjectElementData(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementData(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->data()); } -JSValuePtr jsHTMLObjectElementDeclare(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementDeclare(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->declare()); } -JSValuePtr jsHTMLObjectElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->height()); } -JSValuePtr jsHTMLObjectElementHspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementHspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->hspace()); } -JSValuePtr jsHTMLObjectElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsHTMLObjectElementStandby(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementStandby(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->standby()); } -JSValuePtr jsHTMLObjectElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsHTMLObjectElementUseMap(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementUseMap(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->useMap()); } -JSValuePtr jsHTMLObjectElementVspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementVspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->vspace()); } -JSValuePtr jsHTMLObjectElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->width()); } -JSValuePtr jsHTMLObjectElementContentDocument(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementContentDocument(ExecState* exec, const Identifier&, const PropertySlot& slot) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->impl()); return checkNodeSecurity(exec, imp->contentDocument()) ? toJS(exec, WTF::getPtr(imp->contentDocument())) : jsUndefined(); } -JSValuePtr jsHTMLObjectElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLObjectElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLObjectElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLObjectElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLObjectElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { if (customPut(exec, propertyName, value, slot)) return; lookupPut<JSHTMLObjectElement, Base>(exec, propertyName, value, &JSHTMLObjectElementTable, this, slot); } -void setJSHTMLObjectElementCode(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLObjectElementCode(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(thisObject)->impl()); imp->setCode(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLObjectElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLObjectElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLObjectElementArchive(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLObjectElementArchive(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(thisObject)->impl()); imp->setArchive(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLObjectElementBorder(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLObjectElementBorder(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(thisObject)->impl()); imp->setBorder(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLObjectElementCodeBase(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLObjectElementCodeBase(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(thisObject)->impl()); imp->setCodeBase(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLObjectElementCodeType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLObjectElementCodeType(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(thisObject)->impl()); imp->setCodeType(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLObjectElementData(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLObjectElementData(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(thisObject)->impl()); imp->setData(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLObjectElementDeclare(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLObjectElementDeclare(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(thisObject)->impl()); - imp->setDeclare(value->toBoolean(exec)); + imp->setDeclare(value.toBoolean(exec)); } -void setJSHTMLObjectElementHeight(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLObjectElementHeight(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(thisObject)->impl()); imp->setHeight(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLObjectElementHspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLObjectElementHspace(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(thisObject)->impl()); - imp->setHspace(value->toInt32(exec)); + imp->setHspace(value.toInt32(exec)); } -void setJSHTMLObjectElementName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLObjectElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(thisObject)->impl()); imp->setName(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLObjectElementStandby(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLObjectElementStandby(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(thisObject)->impl()); imp->setStandby(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLObjectElementType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLObjectElementType(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(thisObject)->impl()); imp->setType(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLObjectElementUseMap(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLObjectElementUseMap(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(thisObject)->impl()); imp->setUseMap(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLObjectElementVspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLObjectElementVspace(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(thisObject)->impl()); - imp->setVspace(value->toInt32(exec)); + imp->setVspace(value.toInt32(exec)); } -void setJSHTMLObjectElementWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLObjectElementWidth(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(static_cast<JSHTMLObjectElement*>(thisObject)->impl()); imp->setWidth(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLObjectElement::getConstructor(ExecState* exec) +JSValue JSHTMLObjectElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLObjectElementConstructor>(exec); } -JSValuePtr jsHTMLObjectElementPrototypeFunctionGetSVGDocument(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLObjectElementPrototypeFunctionGetSVGDocument(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLObjectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLObjectElement::s_info)) return throwError(exec, TypeError); JSHTMLObjectElement* castedThisObj = static_cast<JSHTMLObjectElement*>(asObject(thisValue)); HTMLObjectElement* imp = static_cast<HTMLObjectElement*>(castedThisObj->impl()); @@ -398,7 +416,7 @@ JSValuePtr jsHTMLObjectElementPrototypeFunctionGetSVGDocument(ExecState* exec, J return jsUndefined(); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getSVGDocument(ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getSVGDocument(ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.h index e2885ad258..50a9b2787b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.h @@ -32,35 +32,36 @@ class JSHTMLObjectElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLObjectElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLObjectElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); bool customGetOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); - bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); + bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual JSC::CallType getCallData(JSC::CallData&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); private: static bool canGetItemsForName(JSC::ExecState*, HTMLObjectElement*, const JSC::Identifier&); - static JSC::JSValuePtr nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; class JSHTMLObjectElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -69,44 +70,44 @@ public: // Functions -JSC::JSValuePtr jsHTMLObjectElementPrototypeFunctionGetSVGDocument(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLObjectElementPrototypeFunctionGetSVGDocument(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLObjectElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLObjectElementCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLObjectElementCode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLObjectElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLObjectElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLObjectElementArchive(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLObjectElementArchive(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLObjectElementBorder(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLObjectElementBorder(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLObjectElementCodeBase(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLObjectElementCodeBase(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLObjectElementCodeType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLObjectElementCodeType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLObjectElementData(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLObjectElementData(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLObjectElementDeclare(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLObjectElementDeclare(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLObjectElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLObjectElementHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLObjectElementHspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLObjectElementHspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLObjectElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLObjectElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLObjectElementStandby(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLObjectElementStandby(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLObjectElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLObjectElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLObjectElementUseMap(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLObjectElementUseMap(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLObjectElementVspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLObjectElementVspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLObjectElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLObjectElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLObjectElementContentDocument(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLObjectElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLObjectElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLObjectElementCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLObjectElementCode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLObjectElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLObjectElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLObjectElementArchive(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLObjectElementArchive(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLObjectElementBorder(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLObjectElementBorder(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLObjectElementCodeBase(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLObjectElementCodeBase(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLObjectElementCodeType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLObjectElementCodeType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLObjectElementData(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLObjectElementData(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLObjectElementDeclare(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLObjectElementDeclare(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLObjectElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLObjectElementHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLObjectElementHspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLObjectElementHspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLObjectElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLObjectElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLObjectElementStandby(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLObjectElementStandby(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLObjectElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLObjectElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLObjectElementUseMap(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLObjectElementUseMap(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLObjectElementVspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLObjectElementVspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLObjectElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLObjectElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLObjectElementContentDocument(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLObjectElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptGroupElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptGroupElement.cpp index 7ca1fb3f04..10abc77190 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptGroupElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptGroupElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLOptGroupElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLOptGroupElement); /* Hash table */ @@ -72,13 +72,13 @@ public: JSHTMLOptGroupElementConstructor(ExecState* exec) : DOMObject(JSHTMLOptGroupElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLOptGroupElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLOptGroupElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -107,9 +107,9 @@ static const HashTable JSHTMLOptGroupElementPrototypeTable = const ClassInfo JSHTMLOptGroupElementPrototype::s_info = { "HTMLOptGroupElementPrototype", 0, &JSHTMLOptGroupElementPrototypeTable, 0 }; -JSObject* JSHTMLOptGroupElementPrototype::self(ExecState* exec) +JSObject* JSHTMLOptGroupElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLOptGroupElement>(exec); + return getDOMPrototype<JSHTMLOptGroupElement>(exec, globalObject); } const ClassInfo JSHTMLOptGroupElement::s_info = { "HTMLOptGroupElement", &JSHTMLElement::s_info, &JSHTMLOptGroupElementTable, 0 }; @@ -119,9 +119,9 @@ JSHTMLOptGroupElement::JSHTMLOptGroupElement(PassRefPtr<Structure> structure, Pa { } -JSObject* JSHTMLOptGroupElement::createPrototype(ExecState* exec) +JSObject* JSHTMLOptGroupElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLOptGroupElementPrototype(JSHTMLOptGroupElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLOptGroupElementPrototype(JSHTMLOptGroupElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLOptGroupElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -129,40 +129,42 @@ bool JSHTMLOptGroupElement::getOwnPropertySlot(ExecState* exec, const Identifier return getStaticValueSlot<JSHTMLOptGroupElement, Base>(exec, &JSHTMLOptGroupElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLOptGroupElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOptGroupElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLOptGroupElement* imp = static_cast<HTMLOptGroupElement*>(static_cast<JSHTMLOptGroupElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->disabled()); } -JSValuePtr jsHTMLOptGroupElementLabel(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOptGroupElementLabel(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLOptGroupElement* imp = static_cast<HTMLOptGroupElement*>(static_cast<JSHTMLOptGroupElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->label()); } -JSValuePtr jsHTMLOptGroupElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOptGroupElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLOptGroupElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLOptGroupElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLOptGroupElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLOptGroupElement, Base>(exec, propertyName, value, &JSHTMLOptGroupElementTable, this, slot); } -void setJSHTMLOptGroupElementDisabled(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLOptGroupElementDisabled(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLOptGroupElement* imp = static_cast<HTMLOptGroupElement*>(static_cast<JSHTMLOptGroupElement*>(thisObject)->impl()); - imp->setDisabled(value->toBoolean(exec)); + imp->setDisabled(value.toBoolean(exec)); } -void setJSHTMLOptGroupElementLabel(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLOptGroupElementLabel(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLOptGroupElement* imp = static_cast<HTMLOptGroupElement*>(static_cast<JSHTMLOptGroupElement*>(thisObject)->impl()); imp->setLabel(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLOptGroupElement::getConstructor(ExecState* exec) +JSValue JSHTMLOptGroupElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLOptGroupElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptGroupElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptGroupElement.h index 23740f6a63..44cfa44165 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptGroupElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptGroupElement.h @@ -31,24 +31,25 @@ class JSHTMLOptGroupElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLOptGroupElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLOptGroupElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLOptGroupElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLOptGroupElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,11 +57,11 @@ public: // Attributes -JSC::JSValuePtr jsHTMLOptGroupElementDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLOptGroupElementDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLOptGroupElementLabel(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLOptGroupElementLabel(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLOptGroupElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLOptGroupElementDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLOptGroupElementDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLOptGroupElementLabel(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLOptGroupElementLabel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLOptGroupElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionElement.cpp index 0991d2be07..7d5bfae361 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionElement.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLOptionElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLOptionElement); /* Hash table */ @@ -80,13 +80,13 @@ public: JSHTMLOptionElementConstructor(ExecState* exec) : DOMObject(JSHTMLOptionElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLOptionElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLOptionElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -115,9 +115,9 @@ static const HashTable JSHTMLOptionElementPrototypeTable = const ClassInfo JSHTMLOptionElementPrototype::s_info = { "HTMLOptionElementPrototype", 0, &JSHTMLOptionElementPrototypeTable, 0 }; -JSObject* JSHTMLOptionElementPrototype::self(ExecState* exec) +JSObject* JSHTMLOptionElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLOptionElement>(exec); + return getDOMPrototype<JSHTMLOptionElement>(exec, globalObject); } const ClassInfo JSHTMLOptionElement::s_info = { "HTMLOptionElement", &JSHTMLElement::s_info, &JSHTMLOptionElementTable, 0 }; @@ -127,9 +127,9 @@ JSHTMLOptionElement::JSHTMLOptionElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSHTMLOptionElement::createPrototype(ExecState* exec) +JSObject* JSHTMLOptionElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLOptionElementPrototype(JSHTMLOptionElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLOptionElementPrototype(JSHTMLOptionElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLOptionElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -137,70 +137,78 @@ bool JSHTMLOptionElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSHTMLOptionElement, Base>(exec, &JSHTMLOptionElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLOptionElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOptionElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLOptionElement* imp = static_cast<HTMLOptionElement*>(static_cast<JSHTMLOptionElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->form())); } -JSValuePtr jsHTMLOptionElementDefaultSelected(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOptionElementDefaultSelected(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLOptionElement* imp = static_cast<HTMLOptionElement*>(static_cast<JSHTMLOptionElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->defaultSelected()); } -JSValuePtr jsHTMLOptionElementText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOptionElementText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLOptionElement* imp = static_cast<HTMLOptionElement*>(static_cast<JSHTMLOptionElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->text()); } -JSValuePtr jsHTMLOptionElementIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOptionElementIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLOptionElement* imp = static_cast<HTMLOptionElement*>(static_cast<JSHTMLOptionElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->index()); } -JSValuePtr jsHTMLOptionElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOptionElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLOptionElement* imp = static_cast<HTMLOptionElement*>(static_cast<JSHTMLOptionElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->disabled()); } -JSValuePtr jsHTMLOptionElementLabel(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOptionElementLabel(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLOptionElement* imp = static_cast<HTMLOptionElement*>(static_cast<JSHTMLOptionElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->label()); } -JSValuePtr jsHTMLOptionElementSelected(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOptionElementSelected(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLOptionElement* imp = static_cast<HTMLOptionElement*>(static_cast<JSHTMLOptionElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->selected()); } -JSValuePtr jsHTMLOptionElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOptionElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLOptionElement* imp = static_cast<HTMLOptionElement*>(static_cast<JSHTMLOptionElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->value()); } -JSValuePtr jsHTMLOptionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOptionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLOptionElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLOptionElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLOptionElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLOptionElement, Base>(exec, propertyName, value, &JSHTMLOptionElementTable, this, slot); } -void setJSHTMLOptionElementDefaultSelected(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLOptionElementDefaultSelected(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLOptionElement* imp = static_cast<HTMLOptionElement*>(static_cast<JSHTMLOptionElement*>(thisObject)->impl()); - imp->setDefaultSelected(value->toBoolean(exec)); + imp->setDefaultSelected(value.toBoolean(exec)); } -void setJSHTMLOptionElementText(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLOptionElementText(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLOptionElement* imp = static_cast<HTMLOptionElement*>(static_cast<JSHTMLOptionElement*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -208,38 +216,38 @@ void setJSHTMLOptionElementText(ExecState* exec, JSObject* thisObject, JSValuePt setDOMException(exec, ec); } -void setJSHTMLOptionElementDisabled(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLOptionElementDisabled(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLOptionElement* imp = static_cast<HTMLOptionElement*>(static_cast<JSHTMLOptionElement*>(thisObject)->impl()); - imp->setDisabled(value->toBoolean(exec)); + imp->setDisabled(value.toBoolean(exec)); } -void setJSHTMLOptionElementLabel(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLOptionElementLabel(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLOptionElement* imp = static_cast<HTMLOptionElement*>(static_cast<JSHTMLOptionElement*>(thisObject)->impl()); imp->setLabel(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLOptionElementSelected(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLOptionElementSelected(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLOptionElement* imp = static_cast<HTMLOptionElement*>(static_cast<JSHTMLOptionElement*>(thisObject)->impl()); - imp->setSelected(value->toBoolean(exec)); + imp->setSelected(value.toBoolean(exec)); } -void setJSHTMLOptionElementValue(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLOptionElementValue(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLOptionElement* imp = static_cast<HTMLOptionElement*>(static_cast<JSHTMLOptionElement*>(thisObject)->impl()); imp->setValue(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLOptionElement::getConstructor(ExecState* exec) +JSValue JSHTMLOptionElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLOptionElementConstructor>(exec); } -HTMLOptionElement* toHTMLOptionElement(JSC::JSValuePtr value) +HTMLOptionElement* toHTMLOptionElement(JSC::JSValue value) { - return value->isObject(&JSHTMLOptionElement::s_info) ? static_cast<JSHTMLOptionElement*>(asObject(value))->impl() : 0; + return value.isObject(&JSHTMLOptionElement::s_info) ? static_cast<JSHTMLOptionElement*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionElement.h index 3e539863b5..9472282f1f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionElement.h @@ -31,29 +31,30 @@ class JSHTMLOptionElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLOptionElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLOptionElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); HTMLOptionElement* impl() const { return static_cast<HTMLOptionElement*>(Base::impl()); } }; -HTMLOptionElement* toHTMLOptionElement(JSC::JSValuePtr); +HTMLOptionElement* toHTMLOptionElement(JSC::JSValue); class JSHTMLOptionElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLOptionElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -61,21 +62,21 @@ public: // Attributes -JSC::JSValuePtr jsHTMLOptionElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLOptionElementDefaultSelected(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLOptionElementDefaultSelected(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLOptionElementText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLOptionElementText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLOptionElementIndex(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLOptionElementDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLOptionElementDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLOptionElementLabel(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLOptionElementLabel(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLOptionElementSelected(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLOptionElementSelected(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLOptionElementValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLOptionElementValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLOptionElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLOptionElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLOptionElementDefaultSelected(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLOptionElementDefaultSelected(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLOptionElementText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLOptionElementText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLOptionElementIndex(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLOptionElementDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLOptionElementDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLOptionElementLabel(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLOptionElementLabel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLOptionElementSelected(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLOptionElementSelected(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLOptionElementValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLOptionElementValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLOptionElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.cpp index 0d41a1670d..32292293c5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.cpp @@ -33,7 +33,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLOptionsCollection) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLOptionsCollection); /* Hash table */ @@ -69,9 +69,9 @@ static const HashTable JSHTMLOptionsCollectionPrototypeTable = const ClassInfo JSHTMLOptionsCollectionPrototype::s_info = { "HTMLOptionsCollectionPrototype", 0, &JSHTMLOptionsCollectionPrototypeTable, 0 }; -JSObject* JSHTMLOptionsCollectionPrototype::self(ExecState* exec) +JSObject* JSHTMLOptionsCollectionPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLOptionsCollection>(exec); + return getDOMPrototype<JSHTMLOptionsCollection>(exec, globalObject); } bool JSHTMLOptionsCollectionPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -86,9 +86,9 @@ JSHTMLOptionsCollection::JSHTMLOptionsCollection(PassRefPtr<Structure> structure { } -JSObject* JSHTMLOptionsCollection::createPrototype(ExecState* exec) +JSObject* JSHTMLOptionsCollection::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLOptionsCollectionPrototype(JSHTMLOptionsCollectionPrototype::createStructure(JSHTMLCollectionPrototype::self(exec))); + return new (exec) JSHTMLOptionsCollectionPrototype(JSHTMLOptionsCollectionPrototype::createStructure(JSHTMLCollectionPrototype::self(exec, globalObject))); } bool JSHTMLOptionsCollection::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -96,18 +96,19 @@ bool JSHTMLOptionsCollection::getOwnPropertySlot(ExecState* exec, const Identifi return getStaticValueSlot<JSHTMLOptionsCollection, Base>(exec, &JSHTMLOptionsCollectionTable, this, propertyName, slot); } -JSValuePtr jsHTMLOptionsCollectionSelectedIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOptionsCollectionSelectedIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLOptionsCollection* imp = static_cast<HTMLOptionsCollection*>(static_cast<JSHTMLOptionsCollection*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->selectedIndex()); } -JSValuePtr jsHTMLOptionsCollectionLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLOptionsCollectionLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLOptionsCollection*>(asObject(slot.slotBase()))->length(exec); } -void JSHTMLOptionsCollection::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLOptionsCollection::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { bool ok; unsigned index = propertyName.toUInt32(&ok, false); @@ -118,42 +119,44 @@ void JSHTMLOptionsCollection::put(ExecState* exec, const Identifier& propertyNam lookupPut<JSHTMLOptionsCollection, Base>(exec, propertyName, value, &JSHTMLOptionsCollectionTable, this, slot); } -void JSHTMLOptionsCollection::put(ExecState* exec, unsigned propertyName, JSValuePtr value) +void JSHTMLOptionsCollection::put(ExecState* exec, unsigned propertyName, JSValue value) { indexSetter(exec, propertyName, value); return; } -void setJSHTMLOptionsCollectionSelectedIndex(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLOptionsCollectionSelectedIndex(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLOptionsCollection* imp = static_cast<HTMLOptionsCollection*>(static_cast<JSHTMLOptionsCollection*>(thisObject)->impl()); - imp->setSelectedIndex(value->toInt32(exec)); + imp->setSelectedIndex(value.toInt32(exec)); } -void setJSHTMLOptionsCollectionLength(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLOptionsCollectionLength(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSHTMLOptionsCollection*>(thisObject)->setLength(exec, value); } -JSValuePtr jsHTMLOptionsCollectionPrototypeFunctionAdd(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLOptionsCollectionPrototypeFunctionAdd(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLOptionsCollection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLOptionsCollection::s_info)) return throwError(exec, TypeError); JSHTMLOptionsCollection* castedThisObj = static_cast<JSHTMLOptionsCollection*>(asObject(thisValue)); return castedThisObj->add(exec, args); } -JSValuePtr jsHTMLOptionsCollectionPrototypeFunctionRemove(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLOptionsCollectionPrototypeFunctionRemove(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLOptionsCollection::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLOptionsCollection::s_info)) return throwError(exec, TypeError); JSHTMLOptionsCollection* castedThisObj = static_cast<JSHTMLOptionsCollection*>(asObject(thisValue)); return castedThisObj->remove(exec, args); } -HTMLOptionsCollection* toHTMLOptionsCollection(JSC::JSValuePtr value) +HTMLOptionsCollection* toHTMLOptionsCollection(JSC::JSValue value) { - return value->isObject(&JSHTMLOptionsCollection::s_info) ? static_cast<JSHTMLOptionsCollection*>(asObject(value))->impl() : 0; + return value.isObject(&JSHTMLOptionsCollection::s_info) ? static_cast<JSHTMLOptionsCollection*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.h index f1b9defd0e..d2aa15e54f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.h @@ -31,42 +31,43 @@ class JSHTMLOptionsCollection : public JSHTMLCollection { typedef JSHTMLCollection Base; public: JSHTMLOptionsCollection(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLOptionsCollection>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); - virtual void put(JSC::ExecState*, unsigned propertyName, JSC::JSValuePtr); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, unsigned propertyName, JSC::JSValue); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } // Custom attributes - JSC::JSValuePtr length(JSC::ExecState*) const; - void setLength(JSC::ExecState*, JSC::JSValuePtr); + JSC::JSValue length(JSC::ExecState*) const; + void setLength(JSC::ExecState*, JSC::JSValue); // Custom functions - JSC::JSValuePtr add(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr remove(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue add(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue remove(JSC::ExecState*, const JSC::ArgList&); HTMLOptionsCollection* impl() const { return static_cast<HTMLOptionsCollection*>(Base::impl()); } - void indexSetter(JSC::ExecState*, unsigned index, JSC::JSValuePtr); + void indexSetter(JSC::ExecState*, unsigned index, JSC::JSValue); }; -HTMLOptionsCollection* toHTMLOptionsCollection(JSC::JSValuePtr); +HTMLOptionsCollection* toHTMLOptionsCollection(JSC::JSValue); class JSHTMLOptionsCollectionPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -75,14 +76,14 @@ public: // Functions -JSC::JSValuePtr jsHTMLOptionsCollectionPrototypeFunctionAdd(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLOptionsCollectionPrototypeFunctionRemove(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLOptionsCollectionPrototypeFunctionAdd(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLOptionsCollectionPrototypeFunctionRemove(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLOptionsCollectionSelectedIndex(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLOptionsCollectionSelectedIndex(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLOptionsCollectionLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLOptionsCollectionLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsHTMLOptionsCollectionSelectedIndex(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLOptionsCollectionSelectedIndex(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLOptionsCollectionLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLOptionsCollectionLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLParagraphElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLParagraphElement.cpp index 3b8d8522bd..0d745de5f3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLParagraphElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLParagraphElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLParagraphElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLParagraphElement); /* Hash table */ @@ -71,13 +71,13 @@ public: JSHTMLParagraphElementConstructor(ExecState* exec) : DOMObject(JSHTMLParagraphElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLParagraphElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLParagraphElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -106,9 +106,9 @@ static const HashTable JSHTMLParagraphElementPrototypeTable = const ClassInfo JSHTMLParagraphElementPrototype::s_info = { "HTMLParagraphElementPrototype", 0, &JSHTMLParagraphElementPrototypeTable, 0 }; -JSObject* JSHTMLParagraphElementPrototype::self(ExecState* exec) +JSObject* JSHTMLParagraphElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLParagraphElement>(exec); + return getDOMPrototype<JSHTMLParagraphElement>(exec, globalObject); } const ClassInfo JSHTMLParagraphElement::s_info = { "HTMLParagraphElement", &JSHTMLElement::s_info, &JSHTMLParagraphElementTable, 0 }; @@ -118,9 +118,9 @@ JSHTMLParagraphElement::JSHTMLParagraphElement(PassRefPtr<Structure> structure, { } -JSObject* JSHTMLParagraphElement::createPrototype(ExecState* exec) +JSObject* JSHTMLParagraphElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLParagraphElementPrototype(JSHTMLParagraphElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLParagraphElementPrototype(JSHTMLParagraphElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLParagraphElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,28 +128,29 @@ bool JSHTMLParagraphElement::getOwnPropertySlot(ExecState* exec, const Identifie return getStaticValueSlot<JSHTMLParagraphElement, Base>(exec, &JSHTMLParagraphElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLParagraphElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLParagraphElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLParagraphElement* imp = static_cast<HTMLParagraphElement*>(static_cast<JSHTMLParagraphElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLParagraphElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLParagraphElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLParagraphElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLParagraphElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLParagraphElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLParagraphElement, Base>(exec, propertyName, value, &JSHTMLParagraphElementTable, this, slot); } -void setJSHTMLParagraphElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLParagraphElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLParagraphElement* imp = static_cast<HTMLParagraphElement*>(static_cast<JSHTMLParagraphElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLParagraphElement::getConstructor(ExecState* exec) +JSValue JSHTMLParagraphElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLParagraphElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLParagraphElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLParagraphElement.h index 32cb10589d..369384989d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLParagraphElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLParagraphElement.h @@ -31,24 +31,25 @@ class JSHTMLParagraphElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLParagraphElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLParagraphElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLParagraphElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLParagraphElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,9 +57,9 @@ public: // Attributes -JSC::JSValuePtr jsHTMLParagraphElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLParagraphElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLParagraphElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLParagraphElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLParagraphElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLParagraphElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLParamElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLParamElement.cpp index a07976b84b..8f7248d5e0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLParamElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLParamElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLParamElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLParamElement); /* Hash table */ @@ -74,13 +74,13 @@ public: JSHTMLParamElementConstructor(ExecState* exec) : DOMObject(JSHTMLParamElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLParamElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLParamElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -109,9 +109,9 @@ static const HashTable JSHTMLParamElementPrototypeTable = const ClassInfo JSHTMLParamElementPrototype::s_info = { "HTMLParamElementPrototype", 0, &JSHTMLParamElementPrototypeTable, 0 }; -JSObject* JSHTMLParamElementPrototype::self(ExecState* exec) +JSObject* JSHTMLParamElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLParamElement>(exec); + return getDOMPrototype<JSHTMLParamElement>(exec, globalObject); } const ClassInfo JSHTMLParamElement::s_info = { "HTMLParamElement", &JSHTMLElement::s_info, &JSHTMLParamElementTable, 0 }; @@ -121,9 +121,9 @@ JSHTMLParamElement::JSHTMLParamElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSHTMLParamElement::createPrototype(ExecState* exec) +JSObject* JSHTMLParamElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLParamElementPrototype(JSHTMLParamElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLParamElementPrototype(JSHTMLParamElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLParamElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -131,64 +131,68 @@ bool JSHTMLParamElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSHTMLParamElement, Base>(exec, &JSHTMLParamElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLParamElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLParamElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLParamElement* imp = static_cast<HTMLParamElement*>(static_cast<JSHTMLParamElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsHTMLParamElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLParamElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLParamElement* imp = static_cast<HTMLParamElement*>(static_cast<JSHTMLParamElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsHTMLParamElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLParamElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLParamElement* imp = static_cast<HTMLParamElement*>(static_cast<JSHTMLParamElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->value()); } -JSValuePtr jsHTMLParamElementValueType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLParamElementValueType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLParamElement* imp = static_cast<HTMLParamElement*>(static_cast<JSHTMLParamElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->valueType()); } -JSValuePtr jsHTMLParamElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLParamElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLParamElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLParamElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLParamElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLParamElement, Base>(exec, propertyName, value, &JSHTMLParamElementTable, this, slot); } -void setJSHTMLParamElementName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLParamElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLParamElement* imp = static_cast<HTMLParamElement*>(static_cast<JSHTMLParamElement*>(thisObject)->impl()); imp->setName(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLParamElementType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLParamElementType(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLParamElement* imp = static_cast<HTMLParamElement*>(static_cast<JSHTMLParamElement*>(thisObject)->impl()); imp->setType(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLParamElementValue(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLParamElementValue(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLParamElement* imp = static_cast<HTMLParamElement*>(static_cast<JSHTMLParamElement*>(thisObject)->impl()); imp->setValue(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLParamElementValueType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLParamElementValueType(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLParamElement* imp = static_cast<HTMLParamElement*>(static_cast<JSHTMLParamElement*>(thisObject)->impl()); imp->setValueType(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLParamElement::getConstructor(ExecState* exec) +JSValue JSHTMLParamElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLParamElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLParamElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLParamElement.h index 2444be4fbe..7e7760e557 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLParamElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLParamElement.h @@ -31,24 +31,25 @@ class JSHTMLParamElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLParamElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLParamElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLParamElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLParamElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,15 +57,15 @@ public: // Attributes -JSC::JSValuePtr jsHTMLParamElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLParamElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLParamElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLParamElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLParamElementValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLParamElementValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLParamElementValueType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLParamElementValueType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLParamElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLParamElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLParamElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLParamElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLParamElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLParamElementValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLParamElementValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLParamElementValueType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLParamElementValueType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLParamElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLPreElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLPreElement.cpp index b557a17926..0387798a94 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLPreElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLPreElement.cpp @@ -32,7 +32,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLPreElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLPreElement); /* Hash table */ @@ -70,13 +70,13 @@ public: JSHTMLPreElementConstructor(ExecState* exec) : DOMObject(JSHTMLPreElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLPreElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLPreElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -105,9 +105,9 @@ static const HashTable JSHTMLPreElementPrototypeTable = const ClassInfo JSHTMLPreElementPrototype::s_info = { "HTMLPreElementPrototype", 0, &JSHTMLPreElementPrototypeTable, 0 }; -JSObject* JSHTMLPreElementPrototype::self(ExecState* exec) +JSObject* JSHTMLPreElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLPreElement>(exec); + return getDOMPrototype<JSHTMLPreElement>(exec, globalObject); } const ClassInfo JSHTMLPreElement::s_info = { "HTMLPreElement", &JSHTMLElement::s_info, &JSHTMLPreElementTable, 0 }; @@ -117,9 +117,9 @@ JSHTMLPreElement::JSHTMLPreElement(PassRefPtr<Structure> structure, PassRefPtr<H { } -JSObject* JSHTMLPreElement::createPrototype(ExecState* exec) +JSObject* JSHTMLPreElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLPreElementPrototype(JSHTMLPreElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLPreElementPrototype(JSHTMLPreElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLPreElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -127,40 +127,42 @@ bool JSHTMLPreElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSHTMLPreElement, Base>(exec, &JSHTMLPreElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLPreElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLPreElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLPreElement* imp = static_cast<HTMLPreElement*>(static_cast<JSHTMLPreElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->width()); } -JSValuePtr jsHTMLPreElementWrap(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLPreElementWrap(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLPreElement* imp = static_cast<HTMLPreElement*>(static_cast<JSHTMLPreElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->wrap()); } -JSValuePtr jsHTMLPreElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLPreElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLPreElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLPreElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLPreElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLPreElement, Base>(exec, propertyName, value, &JSHTMLPreElementTable, this, slot); } -void setJSHTMLPreElementWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLPreElementWidth(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLPreElement* imp = static_cast<HTMLPreElement*>(static_cast<JSHTMLPreElement*>(thisObject)->impl()); - imp->setWidth(value->toInt32(exec)); + imp->setWidth(value.toInt32(exec)); } -void setJSHTMLPreElementWrap(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLPreElementWrap(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLPreElement* imp = static_cast<HTMLPreElement*>(static_cast<JSHTMLPreElement*>(thisObject)->impl()); - imp->setWrap(value->toBoolean(exec)); + imp->setWrap(value.toBoolean(exec)); } -JSValuePtr JSHTMLPreElement::getConstructor(ExecState* exec) +JSValue JSHTMLPreElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLPreElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLPreElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLPreElement.h index 3081de8faf..1938f930ce 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLPreElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLPreElement.h @@ -31,24 +31,25 @@ class JSHTMLPreElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLPreElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLPreElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLPreElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLPreElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,11 +57,11 @@ public: // Attributes -JSC::JSValuePtr jsHTMLPreElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLPreElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLPreElementWrap(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLPreElementWrap(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLPreElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLPreElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLPreElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLPreElementWrap(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLPreElementWrap(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLPreElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLQuoteElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLQuoteElement.cpp index 517f65bf0b..4eede339d9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLQuoteElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLQuoteElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLQuoteElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLQuoteElement); /* Hash table */ @@ -71,13 +71,13 @@ public: JSHTMLQuoteElementConstructor(ExecState* exec) : DOMObject(JSHTMLQuoteElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLQuoteElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLQuoteElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -106,9 +106,9 @@ static const HashTable JSHTMLQuoteElementPrototypeTable = const ClassInfo JSHTMLQuoteElementPrototype::s_info = { "HTMLQuoteElementPrototype", 0, &JSHTMLQuoteElementPrototypeTable, 0 }; -JSObject* JSHTMLQuoteElementPrototype::self(ExecState* exec) +JSObject* JSHTMLQuoteElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLQuoteElement>(exec); + return getDOMPrototype<JSHTMLQuoteElement>(exec, globalObject); } const ClassInfo JSHTMLQuoteElement::s_info = { "HTMLQuoteElement", &JSHTMLElement::s_info, &JSHTMLQuoteElementTable, 0 }; @@ -118,9 +118,9 @@ JSHTMLQuoteElement::JSHTMLQuoteElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSHTMLQuoteElement::createPrototype(ExecState* exec) +JSObject* JSHTMLQuoteElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLQuoteElementPrototype(JSHTMLQuoteElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLQuoteElementPrototype(JSHTMLQuoteElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLQuoteElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,28 +128,29 @@ bool JSHTMLQuoteElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSHTMLQuoteElement, Base>(exec, &JSHTMLQuoteElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLQuoteElementCite(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLQuoteElementCite(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLQuoteElement* imp = static_cast<HTMLQuoteElement*>(static_cast<JSHTMLQuoteElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->cite()); } -JSValuePtr jsHTMLQuoteElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLQuoteElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLQuoteElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLQuoteElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLQuoteElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLQuoteElement, Base>(exec, propertyName, value, &JSHTMLQuoteElementTable, this, slot); } -void setJSHTMLQuoteElementCite(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLQuoteElementCite(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLQuoteElement* imp = static_cast<HTMLQuoteElement*>(static_cast<JSHTMLQuoteElement*>(thisObject)->impl()); imp->setCite(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLQuoteElement::getConstructor(ExecState* exec) +JSValue JSHTMLQuoteElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLQuoteElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLQuoteElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLQuoteElement.h index 08e6af1c63..a45fc2f2e5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLQuoteElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLQuoteElement.h @@ -31,24 +31,25 @@ class JSHTMLQuoteElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLQuoteElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLQuoteElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLQuoteElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLQuoteElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,9 +57,9 @@ public: // Attributes -JSC::JSValuePtr jsHTMLQuoteElementCite(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLQuoteElementCite(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLQuoteElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLQuoteElementCite(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLQuoteElementCite(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLQuoteElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLScriptElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLScriptElement.cpp index 3a205874d8..a3174e4fe9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLScriptElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLScriptElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLScriptElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLScriptElement); /* Hash table */ @@ -77,13 +77,13 @@ public: JSHTMLScriptElementConstructor(ExecState* exec) : DOMObject(JSHTMLScriptElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLScriptElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLScriptElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -112,9 +112,9 @@ static const HashTable JSHTMLScriptElementPrototypeTable = const ClassInfo JSHTMLScriptElementPrototype::s_info = { "HTMLScriptElementPrototype", 0, &JSHTMLScriptElementPrototypeTable, 0 }; -JSObject* JSHTMLScriptElementPrototype::self(ExecState* exec) +JSObject* JSHTMLScriptElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLScriptElement>(exec); + return getDOMPrototype<JSHTMLScriptElement>(exec, globalObject); } const ClassInfo JSHTMLScriptElement::s_info = { "HTMLScriptElement", &JSHTMLElement::s_info, &JSHTMLScriptElementTable, 0 }; @@ -124,9 +124,9 @@ JSHTMLScriptElement::JSHTMLScriptElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSHTMLScriptElement::createPrototype(ExecState* exec) +JSObject* JSHTMLScriptElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLScriptElementPrototype(JSHTMLScriptElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLScriptElementPrototype(JSHTMLScriptElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLScriptElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -134,100 +134,107 @@ bool JSHTMLScriptElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSHTMLScriptElement, Base>(exec, &JSHTMLScriptElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLScriptElementText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLScriptElementText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLScriptElement* imp = static_cast<HTMLScriptElement*>(static_cast<JSHTMLScriptElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->text()); } -JSValuePtr jsHTMLScriptElementHtmlFor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLScriptElementHtmlFor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLScriptElement* imp = static_cast<HTMLScriptElement*>(static_cast<JSHTMLScriptElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->htmlFor()); } -JSValuePtr jsHTMLScriptElementEvent(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLScriptElementEvent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLScriptElement* imp = static_cast<HTMLScriptElement*>(static_cast<JSHTMLScriptElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->event()); } -JSValuePtr jsHTMLScriptElementCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLScriptElementCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLScriptElement* imp = static_cast<HTMLScriptElement*>(static_cast<JSHTMLScriptElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->charset()); } -JSValuePtr jsHTMLScriptElementDefer(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLScriptElementDefer(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLScriptElement* imp = static_cast<HTMLScriptElement*>(static_cast<JSHTMLScriptElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->defer()); } -JSValuePtr jsHTMLScriptElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLScriptElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLScriptElement* imp = static_cast<HTMLScriptElement*>(static_cast<JSHTMLScriptElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->src()); } -JSValuePtr jsHTMLScriptElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLScriptElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLScriptElement* imp = static_cast<HTMLScriptElement*>(static_cast<JSHTMLScriptElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsHTMLScriptElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLScriptElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLScriptElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLScriptElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLScriptElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLScriptElement, Base>(exec, propertyName, value, &JSHTMLScriptElementTable, this, slot); } -void setJSHTMLScriptElementText(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLScriptElementText(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLScriptElement* imp = static_cast<HTMLScriptElement*>(static_cast<JSHTMLScriptElement*>(thisObject)->impl()); imp->setText(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLScriptElementHtmlFor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLScriptElementHtmlFor(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLScriptElement* imp = static_cast<HTMLScriptElement*>(static_cast<JSHTMLScriptElement*>(thisObject)->impl()); imp->setHtmlFor(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLScriptElementEvent(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLScriptElementEvent(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLScriptElement* imp = static_cast<HTMLScriptElement*>(static_cast<JSHTMLScriptElement*>(thisObject)->impl()); imp->setEvent(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLScriptElementCharset(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLScriptElementCharset(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLScriptElement* imp = static_cast<HTMLScriptElement*>(static_cast<JSHTMLScriptElement*>(thisObject)->impl()); imp->setCharset(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLScriptElementDefer(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLScriptElementDefer(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLScriptElement* imp = static_cast<HTMLScriptElement*>(static_cast<JSHTMLScriptElement*>(thisObject)->impl()); - imp->setDefer(value->toBoolean(exec)); + imp->setDefer(value.toBoolean(exec)); } -void setJSHTMLScriptElementSrc(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLScriptElementSrc(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLScriptElement* imp = static_cast<HTMLScriptElement*>(static_cast<JSHTMLScriptElement*>(thisObject)->impl()); imp->setSrc(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLScriptElementType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLScriptElementType(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLScriptElement* imp = static_cast<HTMLScriptElement*>(static_cast<JSHTMLScriptElement*>(thisObject)->impl()); imp->setType(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLScriptElement::getConstructor(ExecState* exec) +JSValue JSHTMLScriptElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLScriptElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLScriptElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLScriptElement.h index 7a7b344cfc..89b67ef33a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLScriptElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLScriptElement.h @@ -31,24 +31,25 @@ class JSHTMLScriptElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLScriptElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLScriptElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLScriptElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLScriptElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,21 +57,21 @@ public: // Attributes -JSC::JSValuePtr jsHTMLScriptElementText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLScriptElementText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLScriptElementHtmlFor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLScriptElementHtmlFor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLScriptElementEvent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLScriptElementEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLScriptElementCharset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLScriptElementCharset(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLScriptElementDefer(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLScriptElementDefer(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLScriptElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLScriptElementSrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLScriptElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLScriptElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLScriptElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLScriptElementText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLScriptElementText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLScriptElementHtmlFor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLScriptElementHtmlFor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLScriptElementEvent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLScriptElementEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLScriptElementCharset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLScriptElementCharset(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLScriptElementDefer(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLScriptElementDefer(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLScriptElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLScriptElementSrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLScriptElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLScriptElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLScriptElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLSelectElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLSelectElement.cpp index 978165c404..aa8d776758 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLSelectElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLSelectElement.cpp @@ -44,7 +44,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLSelectElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLSelectElement); /* Hash table */ @@ -92,13 +92,13 @@ public: JSHTMLSelectElementConstructor(ExecState* exec) : DOMObject(JSHTMLSelectElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLSelectElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLSelectElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -131,9 +131,9 @@ static const HashTable JSHTMLSelectElementPrototypeTable = const ClassInfo JSHTMLSelectElementPrototype::s_info = { "HTMLSelectElementPrototype", 0, &JSHTMLSelectElementPrototypeTable, 0 }; -JSObject* JSHTMLSelectElementPrototype::self(ExecState* exec) +JSObject* JSHTMLSelectElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLSelectElement>(exec); + return getDOMPrototype<JSHTMLSelectElement>(exec, globalObject); } bool JSHTMLSelectElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -148,9 +148,9 @@ JSHTMLSelectElement::JSHTMLSelectElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSHTMLSelectElement::createPrototype(ExecState* exec) +JSObject* JSHTMLSelectElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLSelectElementPrototype(JSHTMLSelectElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLSelectElementPrototype(JSHTMLSelectElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLSelectElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -178,83 +178,95 @@ bool JSHTMLSelectElement::getOwnPropertySlot(ExecState* exec, unsigned propertyN return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -JSValuePtr jsHTMLSelectElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSelectElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsHTMLSelectElementSelectedIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSelectElementSelectedIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->selectedIndex()); } -JSValuePtr jsHTMLSelectElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSelectElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->value()); } -JSValuePtr jsHTMLSelectElementLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSelectElementLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsHTMLSelectElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSelectElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->form())); } -JSValuePtr jsHTMLSelectElementWillValidate(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSelectElementWillValidate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->willValidate()); } -JSValuePtr jsHTMLSelectElementOptions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSelectElementOptions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->options())); } -JSValuePtr jsHTMLSelectElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSelectElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->disabled()); } -JSValuePtr jsHTMLSelectElementAutofocus(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSelectElementAutofocus(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->autofocus()); } -JSValuePtr jsHTMLSelectElementMultiple(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSelectElementMultiple(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->multiple()); } -JSValuePtr jsHTMLSelectElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSelectElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsHTMLSelectElementSize(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSelectElementSize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->size()); } -JSValuePtr jsHTMLSelectElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSelectElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLSelectElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLSelectElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLSelectElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { bool ok; unsigned index = propertyName.toUInt32(&ok, false); @@ -265,60 +277,60 @@ void JSHTMLSelectElement::put(ExecState* exec, const Identifier& propertyName, J lookupPut<JSHTMLSelectElement, Base>(exec, propertyName, value, &JSHTMLSelectElementTable, this, slot); } -void JSHTMLSelectElement::put(ExecState* exec, unsigned propertyName, JSValuePtr value) +void JSHTMLSelectElement::put(ExecState* exec, unsigned propertyName, JSValue value) { indexSetter(exec, propertyName, value); return; } -void setJSHTMLSelectElementSelectedIndex(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLSelectElementSelectedIndex(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(thisObject)->impl()); - imp->setSelectedIndex(value->toInt32(exec)); + imp->setSelectedIndex(value.toInt32(exec)); } -void setJSHTMLSelectElementValue(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLSelectElementValue(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(thisObject)->impl()); imp->setValue(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLSelectElementLength(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLSelectElementLength(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(thisObject)->impl()); ExceptionCode ec = 0; - imp->setLength(value->toInt32(exec), ec); + imp->setLength(value.toInt32(exec), ec); setDOMException(exec, ec); } -void setJSHTMLSelectElementDisabled(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLSelectElementDisabled(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(thisObject)->impl()); - imp->setDisabled(value->toBoolean(exec)); + imp->setDisabled(value.toBoolean(exec)); } -void setJSHTMLSelectElementAutofocus(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLSelectElementAutofocus(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(thisObject)->impl()); - imp->setAutofocus(value->toBoolean(exec)); + imp->setAutofocus(value.toBoolean(exec)); } -void setJSHTMLSelectElementMultiple(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLSelectElementMultiple(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(thisObject)->impl()); - imp->setMultiple(value->toBoolean(exec)); + imp->setMultiple(value.toBoolean(exec)); } -void setJSHTMLSelectElementName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLSelectElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(thisObject)->impl()); imp->setName(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLSelectElementSize(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLSelectElementSize(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(static_cast<JSHTMLSelectElement*>(thisObject)->impl()); - imp->setSize(value->toInt32(exec)); + imp->setSize(value.toInt32(exec)); } void JSHTMLSelectElement::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames) @@ -328,66 +340,70 @@ void JSHTMLSelectElement::getPropertyNames(ExecState* exec, PropertyNameArray& p Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSHTMLSelectElement::getConstructor(ExecState* exec) +JSValue JSHTMLSelectElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLSelectElementConstructor>(exec); } -JSValuePtr jsHTMLSelectElementPrototypeFunctionAdd(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLSelectElementPrototypeFunctionAdd(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLSelectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLSelectElement::s_info)) return throwError(exec, TypeError); JSHTMLSelectElement* castedThisObj = static_cast<JSHTMLSelectElement*>(asObject(thisValue)); HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - HTMLElement* element = toHTMLElement(args.at(exec, 0)); - HTMLElement* before = toHTMLElement(args.at(exec, 1)); + HTMLElement* element = toHTMLElement(args.at(0)); + HTMLElement* before = toHTMLElement(args.at(1)); imp->add(element, before, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsHTMLSelectElementPrototypeFunctionRemove(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLSelectElementPrototypeFunctionRemove(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLSelectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLSelectElement::s_info)) return throwError(exec, TypeError); JSHTMLSelectElement* castedThisObj = static_cast<JSHTMLSelectElement*>(asObject(thisValue)); return castedThisObj->remove(exec, args); } -JSValuePtr jsHTMLSelectElementPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLSelectElementPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLSelectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLSelectElement::s_info)) return throwError(exec, TypeError); JSHTMLSelectElement* castedThisObj = static_cast<JSHTMLSelectElement*>(asObject(thisValue)); HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(castedThisObj->impl()); - int index = args.at(exec, 0)->toInt32(exec); + int index = args.at(0).toInt32(exec); if (index < 0) { setDOMException(exec, INDEX_SIZE_ERR); return jsUndefined(); } - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); return result; } -JSValuePtr jsHTMLSelectElementPrototypeFunctionNamedItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLSelectElementPrototypeFunctionNamedItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLSelectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLSelectElement::s_info)) return throwError(exec, TypeError); JSHTMLSelectElement* castedThisObj = static_cast<JSHTMLSelectElement*>(asObject(thisValue)); HTMLSelectElement* imp = static_cast<HTMLSelectElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->namedItem(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->namedItem(name))); return result; } -JSValuePtr JSHTMLSelectElement::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue JSHTMLSelectElement::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSHTMLSelectElement* thisObj = static_cast<JSHTMLSelectElement*>(asObject(slot.slotBase())); return toJS(exec, static_cast<HTMLSelectElement*>(thisObj->impl())->item(slot.index())); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLSelectElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLSelectElement.h index 21a6a4a8ba..1790360c5f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLSelectElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLSelectElement.h @@ -31,36 +31,37 @@ class JSHTMLSelectElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLSelectElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLSelectElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); - virtual void put(JSC::ExecState*, unsigned propertyName, JSC::JSValuePtr); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, unsigned propertyName, JSC::JSValue); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom functions - JSC::JSValuePtr remove(JSC::ExecState*, const JSC::ArgList&); - static JSC::JSValuePtr indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); - void indexSetter(JSC::ExecState*, unsigned index, JSC::JSValuePtr); + JSC::JSValue remove(JSC::ExecState*, const JSC::ArgList&); + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + void indexSetter(JSC::ExecState*, unsigned index, JSC::JSValue); }; class JSHTMLSelectElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -69,33 +70,33 @@ public: // Functions -JSC::JSValuePtr jsHTMLSelectElementPrototypeFunctionAdd(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLSelectElementPrototypeFunctionRemove(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLSelectElementPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLSelectElementPrototypeFunctionNamedItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLSelectElementPrototypeFunctionAdd(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLSelectElementPrototypeFunctionRemove(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLSelectElementPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLSelectElementPrototypeFunctionNamedItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLSelectElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLSelectElementSelectedIndex(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLSelectElementSelectedIndex(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLSelectElementValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLSelectElementValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLSelectElementLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLSelectElementLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLSelectElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLSelectElementWillValidate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLSelectElementOptions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLSelectElementDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLSelectElementDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLSelectElementAutofocus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLSelectElementAutofocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLSelectElementMultiple(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLSelectElementMultiple(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLSelectElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLSelectElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLSelectElementSize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLSelectElementSize(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLSelectElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLSelectElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLSelectElementSelectedIndex(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLSelectElementSelectedIndex(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLSelectElementValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLSelectElementValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLSelectElementLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLSelectElementLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLSelectElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLSelectElementWillValidate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLSelectElementOptions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLSelectElementDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLSelectElementDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLSelectElementAutofocus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLSelectElementAutofocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLSelectElementMultiple(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLSelectElementMultiple(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLSelectElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLSelectElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLSelectElementSize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLSelectElementSize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLSelectElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLSourceElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLSourceElement.cpp index 39ca6320f5..1a6c7fcc9c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLSourceElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLSourceElement.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLSourceElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLSourceElement); /* Hash table */ @@ -76,13 +76,13 @@ public: JSHTMLSourceElementConstructor(ExecState* exec) : DOMObject(JSHTMLSourceElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLSourceElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLSourceElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -111,9 +111,9 @@ static const HashTable JSHTMLSourceElementPrototypeTable = const ClassInfo JSHTMLSourceElementPrototype::s_info = { "HTMLSourceElementPrototype", 0, &JSHTMLSourceElementPrototypeTable, 0 }; -JSObject* JSHTMLSourceElementPrototype::self(ExecState* exec) +JSObject* JSHTMLSourceElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLSourceElement>(exec); + return getDOMPrototype<JSHTMLSourceElement>(exec, globalObject); } const ClassInfo JSHTMLSourceElement::s_info = { "HTMLSourceElement", &JSHTMLElement::s_info, &JSHTMLSourceElementTable, 0 }; @@ -123,9 +123,9 @@ JSHTMLSourceElement::JSHTMLSourceElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSHTMLSourceElement::createPrototype(ExecState* exec) +JSObject* JSHTMLSourceElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLSourceElementPrototype(JSHTMLSourceElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLSourceElementPrototype(JSHTMLSourceElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLSourceElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -133,52 +133,55 @@ bool JSHTMLSourceElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSHTMLSourceElement, Base>(exec, &JSHTMLSourceElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLSourceElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSourceElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLSourceElement* imp = static_cast<HTMLSourceElement*>(static_cast<JSHTMLSourceElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->src()); } -JSValuePtr jsHTMLSourceElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSourceElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLSourceElement* imp = static_cast<HTMLSourceElement*>(static_cast<JSHTMLSourceElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsHTMLSourceElementMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSourceElementMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLSourceElement* imp = static_cast<HTMLSourceElement*>(static_cast<JSHTMLSourceElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->media()); } -JSValuePtr jsHTMLSourceElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLSourceElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLSourceElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLSourceElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLSourceElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLSourceElement, Base>(exec, propertyName, value, &JSHTMLSourceElementTable, this, slot); } -void setJSHTMLSourceElementSrc(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLSourceElementSrc(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLSourceElement* imp = static_cast<HTMLSourceElement*>(static_cast<JSHTMLSourceElement*>(thisObject)->impl()); - imp->setSrc(value->toString(exec)); + imp->setSrc(value.toString(exec)); } -void setJSHTMLSourceElementType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLSourceElementType(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLSourceElement* imp = static_cast<HTMLSourceElement*>(static_cast<JSHTMLSourceElement*>(thisObject)->impl()); - imp->setType(value->toString(exec)); + imp->setType(value.toString(exec)); } -void setJSHTMLSourceElementMedia(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLSourceElementMedia(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLSourceElement* imp = static_cast<HTMLSourceElement*>(static_cast<JSHTMLSourceElement*>(thisObject)->impl()); - imp->setMedia(value->toString(exec)); + imp->setMedia(value.toString(exec)); } -JSValuePtr JSHTMLSourceElement::getConstructor(ExecState* exec) +JSValue JSHTMLSourceElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLSourceElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLSourceElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLSourceElement.h index f2538179e2..96b5168297 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLSourceElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLSourceElement.h @@ -34,24 +34,25 @@ class JSHTMLSourceElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLSourceElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLSourceElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLSourceElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLSourceElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -59,13 +60,13 @@ public: // Attributes -JSC::JSValuePtr jsHTMLSourceElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLSourceElementSrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLSourceElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLSourceElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLSourceElementMedia(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLSourceElementMedia(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLSourceElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLSourceElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLSourceElementSrc(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLSourceElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLSourceElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLSourceElementMedia(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLSourceElementMedia(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLSourceElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLStyleElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLStyleElement.cpp index 5afede97c2..c96ae68d20 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLStyleElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLStyleElement.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLStyleElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLStyleElement); /* Hash table */ @@ -76,13 +76,13 @@ public: JSHTMLStyleElementConstructor(ExecState* exec) : DOMObject(JSHTMLStyleElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLStyleElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLStyleElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -111,9 +111,9 @@ static const HashTable JSHTMLStyleElementPrototypeTable = const ClassInfo JSHTMLStyleElementPrototype::s_info = { "HTMLStyleElementPrototype", 0, &JSHTMLStyleElementPrototypeTable, 0 }; -JSObject* JSHTMLStyleElementPrototype::self(ExecState* exec) +JSObject* JSHTMLStyleElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLStyleElement>(exec); + return getDOMPrototype<JSHTMLStyleElement>(exec, globalObject); } const ClassInfo JSHTMLStyleElement::s_info = { "HTMLStyleElement", &JSHTMLElement::s_info, &JSHTMLStyleElementTable, 0 }; @@ -123,9 +123,9 @@ JSHTMLStyleElement::JSHTMLStyleElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSHTMLStyleElement::createPrototype(ExecState* exec) +JSObject* JSHTMLStyleElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLStyleElementPrototype(JSHTMLStyleElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLStyleElementPrototype(JSHTMLStyleElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLStyleElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -133,58 +133,62 @@ bool JSHTMLStyleElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSHTMLStyleElement, Base>(exec, &JSHTMLStyleElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLStyleElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLStyleElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLStyleElement* imp = static_cast<HTMLStyleElement*>(static_cast<JSHTMLStyleElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->disabled()); } -JSValuePtr jsHTMLStyleElementMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLStyleElementMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLStyleElement* imp = static_cast<HTMLStyleElement*>(static_cast<JSHTMLStyleElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->media()); } -JSValuePtr jsHTMLStyleElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLStyleElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLStyleElement* imp = static_cast<HTMLStyleElement*>(static_cast<JSHTMLStyleElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsHTMLStyleElementSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLStyleElementSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLStyleElement* imp = static_cast<HTMLStyleElement*>(static_cast<JSHTMLStyleElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->sheet())); } -JSValuePtr jsHTMLStyleElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLStyleElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLStyleElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLStyleElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLStyleElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLStyleElement, Base>(exec, propertyName, value, &JSHTMLStyleElementTable, this, slot); } -void setJSHTMLStyleElementDisabled(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLStyleElementDisabled(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLStyleElement* imp = static_cast<HTMLStyleElement*>(static_cast<JSHTMLStyleElement*>(thisObject)->impl()); - imp->setDisabled(value->toBoolean(exec)); + imp->setDisabled(value.toBoolean(exec)); } -void setJSHTMLStyleElementMedia(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLStyleElementMedia(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLStyleElement* imp = static_cast<HTMLStyleElement*>(static_cast<JSHTMLStyleElement*>(thisObject)->impl()); imp->setMedia(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLStyleElementType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLStyleElementType(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLStyleElement* imp = static_cast<HTMLStyleElement*>(static_cast<JSHTMLStyleElement*>(thisObject)->impl()); imp->setType(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLStyleElement::getConstructor(ExecState* exec) +JSValue JSHTMLStyleElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLStyleElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLStyleElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLStyleElement.h index c4e704a638..d0e9201eb2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLStyleElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLStyleElement.h @@ -31,24 +31,25 @@ class JSHTMLStyleElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLStyleElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLStyleElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLStyleElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLStyleElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,14 +57,14 @@ public: // Attributes -JSC::JSValuePtr jsHTMLStyleElementDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLStyleElementDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLStyleElementMedia(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLStyleElementMedia(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLStyleElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLStyleElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLStyleElementSheet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLStyleElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLStyleElementDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLStyleElementDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLStyleElementMedia(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLStyleElementMedia(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLStyleElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLStyleElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLStyleElementSheet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLStyleElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCaptionElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCaptionElement.cpp index d67a751c7f..3cc6dba655 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCaptionElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCaptionElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLTableCaptionElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLTableCaptionElement); /* Hash table */ @@ -71,13 +71,13 @@ public: JSHTMLTableCaptionElementConstructor(ExecState* exec) : DOMObject(JSHTMLTableCaptionElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLTableCaptionElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLTableCaptionElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -106,9 +106,9 @@ static const HashTable JSHTMLTableCaptionElementPrototypeTable = const ClassInfo JSHTMLTableCaptionElementPrototype::s_info = { "HTMLTableCaptionElementPrototype", 0, &JSHTMLTableCaptionElementPrototypeTable, 0 }; -JSObject* JSHTMLTableCaptionElementPrototype::self(ExecState* exec) +JSObject* JSHTMLTableCaptionElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLTableCaptionElement>(exec); + return getDOMPrototype<JSHTMLTableCaptionElement>(exec, globalObject); } const ClassInfo JSHTMLTableCaptionElement::s_info = { "HTMLTableCaptionElement", &JSHTMLElement::s_info, &JSHTMLTableCaptionElementTable, 0 }; @@ -118,9 +118,9 @@ JSHTMLTableCaptionElement::JSHTMLTableCaptionElement(PassRefPtr<Structure> struc { } -JSObject* JSHTMLTableCaptionElement::createPrototype(ExecState* exec) +JSObject* JSHTMLTableCaptionElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLTableCaptionElementPrototype(JSHTMLTableCaptionElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLTableCaptionElementPrototype(JSHTMLTableCaptionElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLTableCaptionElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,35 +128,36 @@ bool JSHTMLTableCaptionElement::getOwnPropertySlot(ExecState* exec, const Identi return getStaticValueSlot<JSHTMLTableCaptionElement, Base>(exec, &JSHTMLTableCaptionElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLTableCaptionElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCaptionElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableCaptionElement* imp = static_cast<HTMLTableCaptionElement*>(static_cast<JSHTMLTableCaptionElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLTableCaptionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCaptionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLTableCaptionElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLTableCaptionElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLTableCaptionElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLTableCaptionElement, Base>(exec, propertyName, value, &JSHTMLTableCaptionElementTable, this, slot); } -void setJSHTMLTableCaptionElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableCaptionElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableCaptionElement* imp = static_cast<HTMLTableCaptionElement*>(static_cast<JSHTMLTableCaptionElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLTableCaptionElement::getConstructor(ExecState* exec) +JSValue JSHTMLTableCaptionElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLTableCaptionElementConstructor>(exec); } -HTMLTableCaptionElement* toHTMLTableCaptionElement(JSC::JSValuePtr value) +HTMLTableCaptionElement* toHTMLTableCaptionElement(JSC::JSValue value) { - return value->isObject(&JSHTMLTableCaptionElement::s_info) ? static_cast<JSHTMLTableCaptionElement*>(asObject(value))->impl() : 0; + return value.isObject(&JSHTMLTableCaptionElement::s_info) ? static_cast<JSHTMLTableCaptionElement*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCaptionElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCaptionElement.h index a5f0ea406c..5182e8497e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCaptionElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCaptionElement.h @@ -31,29 +31,30 @@ class JSHTMLTableCaptionElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLTableCaptionElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLTableCaptionElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); HTMLTableCaptionElement* impl() const { return static_cast<HTMLTableCaptionElement*>(Base::impl()); } }; -HTMLTableCaptionElement* toHTMLTableCaptionElement(JSC::JSValuePtr); +HTMLTableCaptionElement* toHTMLTableCaptionElement(JSC::JSValue); class JSHTMLTableCaptionElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLTableCaptionElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -61,9 +62,9 @@ public: // Attributes -JSC::JSValuePtr jsHTMLTableCaptionElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableCaptionElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableCaptionElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTableCaptionElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableCaptionElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableCaptionElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCellElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCellElement.cpp index 6db14329aa..0609f0d08e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCellElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCellElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLTableCellElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLTableCellElement); /* Hash table */ @@ -85,13 +85,13 @@ public: JSHTMLTableCellElementConstructor(ExecState* exec) : DOMObject(JSHTMLTableCellElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLTableCellElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLTableCellElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -120,9 +120,9 @@ static const HashTable JSHTMLTableCellElementPrototypeTable = const ClassInfo JSHTMLTableCellElementPrototype::s_info = { "HTMLTableCellElementPrototype", 0, &JSHTMLTableCellElementPrototypeTable, 0 }; -JSObject* JSHTMLTableCellElementPrototype::self(ExecState* exec) +JSObject* JSHTMLTableCellElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLTableCellElement>(exec); + return getDOMPrototype<JSHTMLTableCellElement>(exec, globalObject); } const ClassInfo JSHTMLTableCellElement::s_info = { "HTMLTableCellElement", &JSHTMLElement::s_info, &JSHTMLTableCellElementTable, 0 }; @@ -132,9 +132,9 @@ JSHTMLTableCellElement::JSHTMLTableCellElement(PassRefPtr<Structure> structure, { } -JSObject* JSHTMLTableCellElement::createPrototype(ExecState* exec) +JSObject* JSHTMLTableCellElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLTableCellElementPrototype(JSHTMLTableCellElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLTableCellElementPrototype(JSHTMLTableCellElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLTableCellElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -142,190 +142,205 @@ bool JSHTMLTableCellElement::getOwnPropertySlot(ExecState* exec, const Identifie return getStaticValueSlot<JSHTMLTableCellElement, Base>(exec, &JSHTMLTableCellElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLTableCellElementCellIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCellElementCellIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->cellIndex()); } -JSValuePtr jsHTMLTableCellElementAbbr(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCellElementAbbr(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->abbr()); } -JSValuePtr jsHTMLTableCellElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCellElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLTableCellElementAxis(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCellElementAxis(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->axis()); } -JSValuePtr jsHTMLTableCellElementBgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCellElementBgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->bgColor()); } -JSValuePtr jsHTMLTableCellElementCh(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCellElementCh(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->ch()); } -JSValuePtr jsHTMLTableCellElementChOff(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCellElementChOff(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->chOff()); } -JSValuePtr jsHTMLTableCellElementColSpan(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCellElementColSpan(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->colSpan()); } -JSValuePtr jsHTMLTableCellElementHeaders(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCellElementHeaders(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->headers()); } -JSValuePtr jsHTMLTableCellElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCellElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->height()); } -JSValuePtr jsHTMLTableCellElementNoWrap(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCellElementNoWrap(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->noWrap()); } -JSValuePtr jsHTMLTableCellElementRowSpan(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCellElementRowSpan(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->rowSpan()); } -JSValuePtr jsHTMLTableCellElementScope(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCellElementScope(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->scope()); } -JSValuePtr jsHTMLTableCellElementVAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCellElementVAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->vAlign()); } -JSValuePtr jsHTMLTableCellElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCellElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->width()); } -JSValuePtr jsHTMLTableCellElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableCellElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLTableCellElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLTableCellElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLTableCellElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLTableCellElement, Base>(exec, propertyName, value, &JSHTMLTableCellElementTable, this, slot); } -void setJSHTMLTableCellElementAbbr(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableCellElementAbbr(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(thisObject)->impl()); imp->setAbbr(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableCellElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableCellElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableCellElementAxis(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableCellElementAxis(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(thisObject)->impl()); imp->setAxis(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableCellElementBgColor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableCellElementBgColor(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(thisObject)->impl()); imp->setBgColor(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableCellElementCh(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableCellElementCh(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(thisObject)->impl()); imp->setCh(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableCellElementChOff(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableCellElementChOff(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(thisObject)->impl()); imp->setChOff(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableCellElementColSpan(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableCellElementColSpan(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(thisObject)->impl()); - imp->setColSpan(value->toInt32(exec)); + imp->setColSpan(value.toInt32(exec)); } -void setJSHTMLTableCellElementHeaders(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableCellElementHeaders(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(thisObject)->impl()); imp->setHeaders(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableCellElementHeight(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableCellElementHeight(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(thisObject)->impl()); imp->setHeight(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableCellElementNoWrap(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableCellElementNoWrap(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(thisObject)->impl()); - imp->setNoWrap(value->toBoolean(exec)); + imp->setNoWrap(value.toBoolean(exec)); } -void setJSHTMLTableCellElementRowSpan(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableCellElementRowSpan(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(thisObject)->impl()); - imp->setRowSpan(value->toInt32(exec)); + imp->setRowSpan(value.toInt32(exec)); } -void setJSHTMLTableCellElementScope(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableCellElementScope(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(thisObject)->impl()); imp->setScope(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableCellElementVAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableCellElementVAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(thisObject)->impl()); imp->setVAlign(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableCellElementWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableCellElementWidth(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableCellElement* imp = static_cast<HTMLTableCellElement*>(static_cast<JSHTMLTableCellElement*>(thisObject)->impl()); imp->setWidth(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLTableCellElement::getConstructor(ExecState* exec) +JSValue JSHTMLTableCellElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLTableCellElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCellElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCellElement.h index ab786f74f0..7aa08ef006 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCellElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCellElement.h @@ -31,24 +31,25 @@ class JSHTMLTableCellElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLTableCellElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLTableCellElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLTableCellElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLTableCellElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,36 +57,36 @@ public: // Attributes -JSC::JSValuePtr jsHTMLTableCellElementCellIndex(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLTableCellElementAbbr(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableCellElementAbbr(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableCellElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableCellElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableCellElementAxis(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableCellElementAxis(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableCellElementBgColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableCellElementBgColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableCellElementCh(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableCellElementCh(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableCellElementChOff(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableCellElementChOff(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableCellElementColSpan(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableCellElementColSpan(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableCellElementHeaders(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableCellElementHeaders(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableCellElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableCellElementHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableCellElementNoWrap(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableCellElementNoWrap(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableCellElementRowSpan(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableCellElementRowSpan(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableCellElementScope(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableCellElementScope(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableCellElementVAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableCellElementVAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableCellElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableCellElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableCellElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTableCellElementCellIndex(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTableCellElementAbbr(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableCellElementAbbr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableCellElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableCellElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableCellElementAxis(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableCellElementAxis(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableCellElementBgColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableCellElementBgColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableCellElementCh(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableCellElementCh(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableCellElementChOff(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableCellElementChOff(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableCellElementColSpan(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableCellElementColSpan(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableCellElementHeaders(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableCellElementHeaders(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableCellElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableCellElementHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableCellElementNoWrap(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableCellElementNoWrap(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableCellElementRowSpan(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableCellElementRowSpan(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableCellElementScope(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableCellElementScope(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableCellElementVAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableCellElementVAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableCellElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableCellElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableCellElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableColElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableColElement.cpp index 6712797808..9e4996c0b9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableColElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableColElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLTableColElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLTableColElement); /* Hash table */ @@ -76,13 +76,13 @@ public: JSHTMLTableColElementConstructor(ExecState* exec) : DOMObject(JSHTMLTableColElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLTableColElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLTableColElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -111,9 +111,9 @@ static const HashTable JSHTMLTableColElementPrototypeTable = const ClassInfo JSHTMLTableColElementPrototype::s_info = { "HTMLTableColElementPrototype", 0, &JSHTMLTableColElementPrototypeTable, 0 }; -JSObject* JSHTMLTableColElementPrototype::self(ExecState* exec) +JSObject* JSHTMLTableColElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLTableColElement>(exec); + return getDOMPrototype<JSHTMLTableColElement>(exec, globalObject); } const ClassInfo JSHTMLTableColElement::s_info = { "HTMLTableColElement", &JSHTMLElement::s_info, &JSHTMLTableColElementTable, 0 }; @@ -123,9 +123,9 @@ JSHTMLTableColElement::JSHTMLTableColElement(PassRefPtr<Structure> structure, Pa { } -JSObject* JSHTMLTableColElement::createPrototype(ExecState* exec) +JSObject* JSHTMLTableColElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLTableColElementPrototype(JSHTMLTableColElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLTableColElementPrototype(JSHTMLTableColElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLTableColElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -133,88 +133,94 @@ bool JSHTMLTableColElement::getOwnPropertySlot(ExecState* exec, const Identifier return getStaticValueSlot<JSHTMLTableColElement, Base>(exec, &JSHTMLTableColElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLTableColElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableColElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableColElement* imp = static_cast<HTMLTableColElement*>(static_cast<JSHTMLTableColElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLTableColElementCh(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableColElementCh(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableColElement* imp = static_cast<HTMLTableColElement*>(static_cast<JSHTMLTableColElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->ch()); } -JSValuePtr jsHTMLTableColElementChOff(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableColElementChOff(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableColElement* imp = static_cast<HTMLTableColElement*>(static_cast<JSHTMLTableColElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->chOff()); } -JSValuePtr jsHTMLTableColElementSpan(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableColElementSpan(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableColElement* imp = static_cast<HTMLTableColElement*>(static_cast<JSHTMLTableColElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->span()); } -JSValuePtr jsHTMLTableColElementVAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableColElementVAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableColElement* imp = static_cast<HTMLTableColElement*>(static_cast<JSHTMLTableColElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->vAlign()); } -JSValuePtr jsHTMLTableColElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableColElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableColElement* imp = static_cast<HTMLTableColElement*>(static_cast<JSHTMLTableColElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->width()); } -JSValuePtr jsHTMLTableColElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableColElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLTableColElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLTableColElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLTableColElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLTableColElement, Base>(exec, propertyName, value, &JSHTMLTableColElementTable, this, slot); } -void setJSHTMLTableColElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableColElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableColElement* imp = static_cast<HTMLTableColElement*>(static_cast<JSHTMLTableColElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableColElementCh(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableColElementCh(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableColElement* imp = static_cast<HTMLTableColElement*>(static_cast<JSHTMLTableColElement*>(thisObject)->impl()); imp->setCh(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableColElementChOff(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableColElementChOff(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableColElement* imp = static_cast<HTMLTableColElement*>(static_cast<JSHTMLTableColElement*>(thisObject)->impl()); imp->setChOff(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableColElementSpan(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableColElementSpan(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableColElement* imp = static_cast<HTMLTableColElement*>(static_cast<JSHTMLTableColElement*>(thisObject)->impl()); - imp->setSpan(value->toInt32(exec)); + imp->setSpan(value.toInt32(exec)); } -void setJSHTMLTableColElementVAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableColElementVAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableColElement* imp = static_cast<HTMLTableColElement*>(static_cast<JSHTMLTableColElement*>(thisObject)->impl()); imp->setVAlign(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableColElementWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableColElementWidth(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableColElement* imp = static_cast<HTMLTableColElement*>(static_cast<JSHTMLTableColElement*>(thisObject)->impl()); imp->setWidth(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLTableColElement::getConstructor(ExecState* exec) +JSValue JSHTMLTableColElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLTableColElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableColElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableColElement.h index 12562cff99..a060d19bac 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableColElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableColElement.h @@ -31,24 +31,25 @@ class JSHTMLTableColElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLTableColElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLTableColElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLTableColElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLTableColElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,19 +57,19 @@ public: // Attributes -JSC::JSValuePtr jsHTMLTableColElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableColElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableColElementCh(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableColElementCh(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableColElementChOff(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableColElementChOff(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableColElementSpan(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableColElementSpan(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableColElementVAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableColElementVAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableColElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableColElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableColElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTableColElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableColElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableColElementCh(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableColElementCh(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableColElementChOff(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableColElementChOff(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableColElementSpan(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableColElementSpan(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableColElementVAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableColElementVAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableColElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableColElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableColElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.cpp index c28f67d48a..13e9d57648 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.cpp @@ -43,7 +43,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLTableElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLTableElement); /* Hash table */ @@ -93,13 +93,13 @@ public: JSHTMLTableElementConstructor(ExecState* exec) : DOMObject(JSHTMLTableElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLTableElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLTableElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -136,9 +136,9 @@ static const HashTable JSHTMLTableElementPrototypeTable = const ClassInfo JSHTMLTableElementPrototype::s_info = { "HTMLTableElementPrototype", 0, &JSHTMLTableElementPrototypeTable, 0 }; -JSObject* JSHTMLTableElementPrototype::self(ExecState* exec) +JSObject* JSHTMLTableElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLTableElement>(exec); + return getDOMPrototype<JSHTMLTableElement>(exec, globalObject); } bool JSHTMLTableElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -153,9 +153,9 @@ JSHTMLTableElement::JSHTMLTableElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSHTMLTableElement::createPrototype(ExecState* exec) +JSObject* JSHTMLTableElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLTableElementPrototype(JSHTMLTableElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLTableElementPrototype(JSHTMLTableElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLTableElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -163,100 +163,114 @@ bool JSHTMLTableElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSHTMLTableElement, Base>(exec, &JSHTMLTableElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLTableElementCaption(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableElementCaption(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->caption())); } -JSValuePtr jsHTMLTableElementTHead(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableElementTHead(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->tHead())); } -JSValuePtr jsHTMLTableElementTFoot(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableElementTFoot(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->tFoot())); } -JSValuePtr jsHTMLTableElementRows(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableElementRows(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->rows())); } -JSValuePtr jsHTMLTableElementTBodies(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableElementTBodies(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->tBodies())); } -JSValuePtr jsHTMLTableElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLTableElementBgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableElementBgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->bgColor()); } -JSValuePtr jsHTMLTableElementBorder(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableElementBorder(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->border()); } -JSValuePtr jsHTMLTableElementCellPadding(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableElementCellPadding(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->cellPadding()); } -JSValuePtr jsHTMLTableElementCellSpacing(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableElementCellSpacing(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->cellSpacing()); } -JSValuePtr jsHTMLTableElementFrame(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableElementFrame(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->frame()); } -JSValuePtr jsHTMLTableElementRules(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableElementRules(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->rules()); } -JSValuePtr jsHTMLTableElementSummary(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableElementSummary(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->summary()); } -JSValuePtr jsHTMLTableElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->width()); } -JSValuePtr jsHTMLTableElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLTableElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLTableElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLTableElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLTableElement, Base>(exec, propertyName, value, &JSHTMLTableElementTable, this, slot); } -void setJSHTMLTableElementCaption(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableElementCaption(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -264,7 +278,7 @@ void setJSHTMLTableElementCaption(ExecState* exec, JSObject* thisObject, JSValue setDOMException(exec, ec); } -void setJSHTMLTableElementTHead(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableElementTHead(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -272,7 +286,7 @@ void setJSHTMLTableElementTHead(ExecState* exec, JSObject* thisObject, JSValuePt setDOMException(exec, ec); } -void setJSHTMLTableElementTFoot(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableElementTFoot(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -280,80 +294,82 @@ void setJSHTMLTableElementTFoot(ExecState* exec, JSObject* thisObject, JSValuePt setDOMException(exec, ec); } -void setJSHTMLTableElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableElementBgColor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableElementBgColor(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(thisObject)->impl()); imp->setBgColor(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableElementBorder(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableElementBorder(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(thisObject)->impl()); imp->setBorder(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableElementCellPadding(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableElementCellPadding(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(thisObject)->impl()); imp->setCellPadding(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableElementCellSpacing(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableElementCellSpacing(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(thisObject)->impl()); imp->setCellSpacing(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableElementFrame(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableElementFrame(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(thisObject)->impl()); imp->setFrame(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableElementRules(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableElementRules(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(thisObject)->impl()); imp->setRules(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableElementSummary(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableElementSummary(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(thisObject)->impl()); imp->setSummary(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableElementWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableElementWidth(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableElement* imp = static_cast<HTMLTableElement*>(static_cast<JSHTMLTableElement*>(thisObject)->impl()); imp->setWidth(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLTableElement::getConstructor(ExecState* exec) +JSValue JSHTMLTableElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLTableElementConstructor>(exec); } -JSValuePtr jsHTMLTableElementPrototypeFunctionCreateTHead(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionCreateTHead(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLTableElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLTableElement::s_info)) return throwError(exec, TypeError); JSHTMLTableElement* castedThisObj = static_cast<JSHTMLTableElement*>(asObject(thisValue)); HTMLTableElement* imp = static_cast<HTMLTableElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createTHead())); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createTHead())); return result; } -JSValuePtr jsHTMLTableElementPrototypeFunctionDeleteTHead(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionDeleteTHead(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLTableElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLTableElement::s_info)) return throwError(exec, TypeError); JSHTMLTableElement* castedThisObj = static_cast<JSHTMLTableElement*>(asObject(thisValue)); HTMLTableElement* imp = static_cast<HTMLTableElement*>(castedThisObj->impl()); @@ -362,21 +378,23 @@ JSValuePtr jsHTMLTableElementPrototypeFunctionDeleteTHead(ExecState* exec, JSObj return jsUndefined(); } -JSValuePtr jsHTMLTableElementPrototypeFunctionCreateTFoot(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionCreateTFoot(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLTableElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLTableElement::s_info)) return throwError(exec, TypeError); JSHTMLTableElement* castedThisObj = static_cast<JSHTMLTableElement*>(asObject(thisValue)); HTMLTableElement* imp = static_cast<HTMLTableElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createTFoot())); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createTFoot())); return result; } -JSValuePtr jsHTMLTableElementPrototypeFunctionDeleteTFoot(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionDeleteTFoot(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLTableElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLTableElement::s_info)) return throwError(exec, TypeError); JSHTMLTableElement* castedThisObj = static_cast<JSHTMLTableElement*>(asObject(thisValue)); HTMLTableElement* imp = static_cast<HTMLTableElement*>(castedThisObj->impl()); @@ -385,21 +403,23 @@ JSValuePtr jsHTMLTableElementPrototypeFunctionDeleteTFoot(ExecState* exec, JSObj return jsUndefined(); } -JSValuePtr jsHTMLTableElementPrototypeFunctionCreateCaption(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionCreateCaption(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLTableElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLTableElement::s_info)) return throwError(exec, TypeError); JSHTMLTableElement* castedThisObj = static_cast<JSHTMLTableElement*>(asObject(thisValue)); HTMLTableElement* imp = static_cast<HTMLTableElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createCaption())); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createCaption())); return result; } -JSValuePtr jsHTMLTableElementPrototypeFunctionDeleteCaption(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionDeleteCaption(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLTableElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLTableElement::s_info)) return throwError(exec, TypeError); JSHTMLTableElement* castedThisObj = static_cast<JSHTMLTableElement*>(asObject(thisValue)); HTMLTableElement* imp = static_cast<HTMLTableElement*>(castedThisObj->impl()); @@ -408,29 +428,31 @@ JSValuePtr jsHTMLTableElementPrototypeFunctionDeleteCaption(ExecState* exec, JSO return jsUndefined(); } -JSValuePtr jsHTMLTableElementPrototypeFunctionInsertRow(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionInsertRow(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLTableElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLTableElement::s_info)) return throwError(exec, TypeError); JSHTMLTableElement* castedThisObj = static_cast<JSHTMLTableElement*>(asObject(thisValue)); HTMLTableElement* imp = static_cast<HTMLTableElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - int index = args.at(exec, 0)->toInt32(exec); + int index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->insertRow(index, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->insertRow(index, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsHTMLTableElementPrototypeFunctionDeleteRow(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionDeleteRow(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLTableElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLTableElement::s_info)) return throwError(exec, TypeError); JSHTMLTableElement* castedThisObj = static_cast<JSHTMLTableElement*>(asObject(thisValue)); HTMLTableElement* imp = static_cast<HTMLTableElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - int index = args.at(exec, 0)->toInt32(exec); + int index = args.at(0).toInt32(exec); imp->deleteRow(index, ec); setDOMException(exec, ec); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.h index a246801146..234d812468 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.h @@ -31,28 +31,29 @@ class JSHTMLTableElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLTableElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLTableElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLTableElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -61,43 +62,43 @@ public: // Functions -JSC::JSValuePtr jsHTMLTableElementPrototypeFunctionCreateTHead(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLTableElementPrototypeFunctionDeleteTHead(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLTableElementPrototypeFunctionCreateTFoot(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLTableElementPrototypeFunctionDeleteTFoot(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLTableElementPrototypeFunctionCreateCaption(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLTableElementPrototypeFunctionDeleteCaption(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLTableElementPrototypeFunctionInsertRow(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLTableElementPrototypeFunctionDeleteRow(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionCreateTHead(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionDeleteTHead(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionCreateTFoot(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionDeleteTFoot(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionCreateCaption(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionDeleteCaption(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionInsertRow(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionDeleteRow(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLTableElementCaption(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableElementCaption(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableElementTHead(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableElementTHead(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableElementTFoot(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableElementTFoot(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableElementRows(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLTableElementTBodies(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLTableElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableElementBgColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableElementBgColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableElementBorder(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableElementBorder(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableElementCellPadding(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableElementCellPadding(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableElementCellSpacing(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableElementCellSpacing(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableElementFrame(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableElementFrame(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableElementRules(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableElementRules(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableElementSummary(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableElementSummary(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTableElementCaption(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableElementCaption(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableElementTHead(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableElementTHead(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableElementTFoot(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableElementTFoot(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableElementRows(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTableElementTBodies(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTableElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableElementBgColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableElementBgColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableElementBorder(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableElementBorder(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableElementCellPadding(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableElementCellPadding(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableElementCellSpacing(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableElementCellSpacing(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableElementFrame(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableElementFrame(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableElementRules(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableElementRules(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableElementSummary(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableElementSummary(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableRowElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableRowElement.cpp index 541036cce5..d6f1d8f1c4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableRowElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableRowElement.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLTableRowElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLTableRowElement); /* Hash table */ @@ -83,13 +83,13 @@ public: JSHTMLTableRowElementConstructor(ExecState* exec) : DOMObject(JSHTMLTableRowElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLTableRowElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLTableRowElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -120,9 +120,9 @@ static const HashTable JSHTMLTableRowElementPrototypeTable = const ClassInfo JSHTMLTableRowElementPrototype::s_info = { "HTMLTableRowElementPrototype", 0, &JSHTMLTableRowElementPrototypeTable, 0 }; -JSObject* JSHTMLTableRowElementPrototype::self(ExecState* exec) +JSObject* JSHTMLTableRowElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLTableRowElement>(exec); + return getDOMPrototype<JSHTMLTableRowElement>(exec, globalObject); } bool JSHTMLTableRowElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -137,9 +137,9 @@ JSHTMLTableRowElement::JSHTMLTableRowElement(PassRefPtr<Structure> structure, Pa { } -JSObject* JSHTMLTableRowElement::createPrototype(ExecState* exec) +JSObject* JSHTMLTableRowElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLTableRowElementPrototype(JSHTMLTableRowElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLTableRowElementPrototype(JSHTMLTableRowElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLTableRowElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -147,121 +147,131 @@ bool JSHTMLTableRowElement::getOwnPropertySlot(ExecState* exec, const Identifier return getStaticValueSlot<JSHTMLTableRowElement, Base>(exec, &JSHTMLTableRowElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLTableRowElementRowIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableRowElementRowIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableRowElement* imp = static_cast<HTMLTableRowElement*>(static_cast<JSHTMLTableRowElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->rowIndex()); } -JSValuePtr jsHTMLTableRowElementSectionRowIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableRowElementSectionRowIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableRowElement* imp = static_cast<HTMLTableRowElement*>(static_cast<JSHTMLTableRowElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->sectionRowIndex()); } -JSValuePtr jsHTMLTableRowElementCells(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableRowElementCells(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableRowElement* imp = static_cast<HTMLTableRowElement*>(static_cast<JSHTMLTableRowElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->cells())); } -JSValuePtr jsHTMLTableRowElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableRowElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableRowElement* imp = static_cast<HTMLTableRowElement*>(static_cast<JSHTMLTableRowElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLTableRowElementBgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableRowElementBgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableRowElement* imp = static_cast<HTMLTableRowElement*>(static_cast<JSHTMLTableRowElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->bgColor()); } -JSValuePtr jsHTMLTableRowElementCh(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableRowElementCh(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableRowElement* imp = static_cast<HTMLTableRowElement*>(static_cast<JSHTMLTableRowElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->ch()); } -JSValuePtr jsHTMLTableRowElementChOff(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableRowElementChOff(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableRowElement* imp = static_cast<HTMLTableRowElement*>(static_cast<JSHTMLTableRowElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->chOff()); } -JSValuePtr jsHTMLTableRowElementVAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableRowElementVAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableRowElement* imp = static_cast<HTMLTableRowElement*>(static_cast<JSHTMLTableRowElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->vAlign()); } -JSValuePtr jsHTMLTableRowElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableRowElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLTableRowElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLTableRowElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLTableRowElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLTableRowElement, Base>(exec, propertyName, value, &JSHTMLTableRowElementTable, this, slot); } -void setJSHTMLTableRowElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableRowElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableRowElement* imp = static_cast<HTMLTableRowElement*>(static_cast<JSHTMLTableRowElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableRowElementBgColor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableRowElementBgColor(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableRowElement* imp = static_cast<HTMLTableRowElement*>(static_cast<JSHTMLTableRowElement*>(thisObject)->impl()); imp->setBgColor(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableRowElementCh(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableRowElementCh(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableRowElement* imp = static_cast<HTMLTableRowElement*>(static_cast<JSHTMLTableRowElement*>(thisObject)->impl()); imp->setCh(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableRowElementChOff(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableRowElementChOff(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableRowElement* imp = static_cast<HTMLTableRowElement*>(static_cast<JSHTMLTableRowElement*>(thisObject)->impl()); imp->setChOff(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableRowElementVAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableRowElementVAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableRowElement* imp = static_cast<HTMLTableRowElement*>(static_cast<JSHTMLTableRowElement*>(thisObject)->impl()); imp->setVAlign(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLTableRowElement::getConstructor(ExecState* exec) +JSValue JSHTMLTableRowElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLTableRowElementConstructor>(exec); } -JSValuePtr jsHTMLTableRowElementPrototypeFunctionInsertCell(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLTableRowElementPrototypeFunctionInsertCell(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLTableRowElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLTableRowElement::s_info)) return throwError(exec, TypeError); JSHTMLTableRowElement* castedThisObj = static_cast<JSHTMLTableRowElement*>(asObject(thisValue)); HTMLTableRowElement* imp = static_cast<HTMLTableRowElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - int index = args.at(exec, 0)->toInt32(exec); + int index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->insertCell(index, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->insertCell(index, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsHTMLTableRowElementPrototypeFunctionDeleteCell(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLTableRowElementPrototypeFunctionDeleteCell(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLTableRowElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLTableRowElement::s_info)) return throwError(exec, TypeError); JSHTMLTableRowElement* castedThisObj = static_cast<JSHTMLTableRowElement*>(asObject(thisValue)); HTMLTableRowElement* imp = static_cast<HTMLTableRowElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - int index = args.at(exec, 0)->toInt32(exec); + int index = args.at(0).toInt32(exec); imp->deleteCell(index, ec); setDOMException(exec, ec); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableRowElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableRowElement.h index 65219c582a..e3e93bceb2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableRowElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableRowElement.h @@ -31,28 +31,29 @@ class JSHTMLTableRowElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLTableRowElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLTableRowElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLTableRowElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -61,24 +62,24 @@ public: // Functions -JSC::JSValuePtr jsHTMLTableRowElementPrototypeFunctionInsertCell(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLTableRowElementPrototypeFunctionDeleteCell(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLTableRowElementPrototypeFunctionInsertCell(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLTableRowElementPrototypeFunctionDeleteCell(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLTableRowElementRowIndex(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLTableRowElementSectionRowIndex(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLTableRowElementCells(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLTableRowElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableRowElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableRowElementBgColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableRowElementBgColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableRowElementCh(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableRowElementCh(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableRowElementChOff(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableRowElementChOff(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableRowElementVAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableRowElementVAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableRowElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTableRowElementRowIndex(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTableRowElementSectionRowIndex(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTableRowElementCells(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTableRowElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableRowElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableRowElementBgColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableRowElementBgColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableRowElementCh(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableRowElementCh(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableRowElementChOff(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableRowElementChOff(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableRowElementVAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableRowElementVAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableRowElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableSectionElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableSectionElement.cpp index 97fad79488..ddb9e2eedd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableSectionElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableSectionElement.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLTableSectionElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLTableSectionElement); /* Hash table */ @@ -80,13 +80,13 @@ public: JSHTMLTableSectionElementConstructor(ExecState* exec) : DOMObject(JSHTMLTableSectionElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLTableSectionElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLTableSectionElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -117,9 +117,9 @@ static const HashTable JSHTMLTableSectionElementPrototypeTable = const ClassInfo JSHTMLTableSectionElementPrototype::s_info = { "HTMLTableSectionElementPrototype", 0, &JSHTMLTableSectionElementPrototypeTable, 0 }; -JSObject* JSHTMLTableSectionElementPrototype::self(ExecState* exec) +JSObject* JSHTMLTableSectionElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLTableSectionElement>(exec); + return getDOMPrototype<JSHTMLTableSectionElement>(exec, globalObject); } bool JSHTMLTableSectionElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -134,9 +134,9 @@ JSHTMLTableSectionElement::JSHTMLTableSectionElement(PassRefPtr<Structure> struc { } -JSObject* JSHTMLTableSectionElement::createPrototype(ExecState* exec) +JSObject* JSHTMLTableSectionElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLTableSectionElementPrototype(JSHTMLTableSectionElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLTableSectionElementPrototype(JSHTMLTableSectionElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLTableSectionElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -144,106 +144,113 @@ bool JSHTMLTableSectionElement::getOwnPropertySlot(ExecState* exec, const Identi return getStaticValueSlot<JSHTMLTableSectionElement, Base>(exec, &JSHTMLTableSectionElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLTableSectionElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableSectionElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableSectionElement* imp = static_cast<HTMLTableSectionElement*>(static_cast<JSHTMLTableSectionElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->align()); } -JSValuePtr jsHTMLTableSectionElementCh(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableSectionElementCh(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableSectionElement* imp = static_cast<HTMLTableSectionElement*>(static_cast<JSHTMLTableSectionElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->ch()); } -JSValuePtr jsHTMLTableSectionElementChOff(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableSectionElementChOff(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableSectionElement* imp = static_cast<HTMLTableSectionElement*>(static_cast<JSHTMLTableSectionElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->chOff()); } -JSValuePtr jsHTMLTableSectionElementVAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableSectionElementVAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableSectionElement* imp = static_cast<HTMLTableSectionElement*>(static_cast<JSHTMLTableSectionElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->vAlign()); } -JSValuePtr jsHTMLTableSectionElementRows(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableSectionElementRows(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTableSectionElement* imp = static_cast<HTMLTableSectionElement*>(static_cast<JSHTMLTableSectionElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->rows())); } -JSValuePtr jsHTMLTableSectionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTableSectionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLTableSectionElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLTableSectionElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLTableSectionElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLTableSectionElement, Base>(exec, propertyName, value, &JSHTMLTableSectionElementTable, this, slot); } -void setJSHTMLTableSectionElementAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableSectionElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableSectionElement* imp = static_cast<HTMLTableSectionElement*>(static_cast<JSHTMLTableSectionElement*>(thisObject)->impl()); imp->setAlign(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableSectionElementCh(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableSectionElementCh(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableSectionElement* imp = static_cast<HTMLTableSectionElement*>(static_cast<JSHTMLTableSectionElement*>(thisObject)->impl()); imp->setCh(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableSectionElementChOff(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableSectionElementChOff(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableSectionElement* imp = static_cast<HTMLTableSectionElement*>(static_cast<JSHTMLTableSectionElement*>(thisObject)->impl()); imp->setChOff(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTableSectionElementVAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTableSectionElementVAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTableSectionElement* imp = static_cast<HTMLTableSectionElement*>(static_cast<JSHTMLTableSectionElement*>(thisObject)->impl()); imp->setVAlign(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLTableSectionElement::getConstructor(ExecState* exec) +JSValue JSHTMLTableSectionElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLTableSectionElementConstructor>(exec); } -JSValuePtr jsHTMLTableSectionElementPrototypeFunctionInsertRow(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLTableSectionElementPrototypeFunctionInsertRow(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLTableSectionElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLTableSectionElement::s_info)) return throwError(exec, TypeError); JSHTMLTableSectionElement* castedThisObj = static_cast<JSHTMLTableSectionElement*>(asObject(thisValue)); HTMLTableSectionElement* imp = static_cast<HTMLTableSectionElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - int index = args.at(exec, 0)->toInt32(exec); + int index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->insertRow(index, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->insertRow(index, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsHTMLTableSectionElementPrototypeFunctionDeleteRow(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLTableSectionElementPrototypeFunctionDeleteRow(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLTableSectionElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLTableSectionElement::s_info)) return throwError(exec, TypeError); JSHTMLTableSectionElement* castedThisObj = static_cast<JSHTMLTableSectionElement*>(asObject(thisValue)); HTMLTableSectionElement* imp = static_cast<HTMLTableSectionElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - int index = args.at(exec, 0)->toInt32(exec); + int index = args.at(0).toInt32(exec); imp->deleteRow(index, ec); setDOMException(exec, ec); return jsUndefined(); } -HTMLTableSectionElement* toHTMLTableSectionElement(JSC::JSValuePtr value) +HTMLTableSectionElement* toHTMLTableSectionElement(JSC::JSValue value) { - return value->isObject(&JSHTMLTableSectionElement::s_info) ? static_cast<JSHTMLTableSectionElement*>(asObject(value))->impl() : 0; + return value.isObject(&JSHTMLTableSectionElement::s_info) ? static_cast<JSHTMLTableSectionElement*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableSectionElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableSectionElement.h index 5fef3e9151..1d3b1f8fd8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableSectionElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableSectionElement.h @@ -31,33 +31,34 @@ class JSHTMLTableSectionElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLTableSectionElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLTableSectionElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); HTMLTableSectionElement* impl() const { return static_cast<HTMLTableSectionElement*>(Base::impl()); } }; -HTMLTableSectionElement* toHTMLTableSectionElement(JSC::JSValuePtr); +HTMLTableSectionElement* toHTMLTableSectionElement(JSC::JSValue); class JSHTMLTableSectionElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -66,20 +67,20 @@ public: // Functions -JSC::JSValuePtr jsHTMLTableSectionElementPrototypeFunctionInsertRow(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLTableSectionElementPrototypeFunctionDeleteRow(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLTableSectionElementPrototypeFunctionInsertRow(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLTableSectionElementPrototypeFunctionDeleteRow(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLTableSectionElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableSectionElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableSectionElementCh(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableSectionElementCh(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableSectionElementChOff(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableSectionElementChOff(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableSectionElementVAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTableSectionElementVAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTableSectionElementRows(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLTableSectionElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTableSectionElementAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableSectionElementAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableSectionElementCh(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableSectionElementCh(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableSectionElementChOff(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableSectionElementChOff(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableSectionElementVAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTableSectionElementVAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTableSectionElementRows(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTableSectionElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.cpp index 3bb257204f..650aaadedd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLTextAreaElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLTextAreaElement); /* Hash table */ @@ -87,13 +87,13 @@ public: JSHTMLTextAreaElementConstructor(ExecState* exec) : DOMObject(JSHTMLTextAreaElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLTextAreaElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLTextAreaElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -124,9 +124,9 @@ static const HashTable JSHTMLTextAreaElementPrototypeTable = const ClassInfo JSHTMLTextAreaElementPrototype::s_info = { "HTMLTextAreaElementPrototype", 0, &JSHTMLTextAreaElementPrototypeTable, 0 }; -JSObject* JSHTMLTextAreaElementPrototype::self(ExecState* exec) +JSObject* JSHTMLTextAreaElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLTextAreaElement>(exec); + return getDOMPrototype<JSHTMLTextAreaElement>(exec, globalObject); } bool JSHTMLTextAreaElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -141,9 +141,9 @@ JSHTMLTextAreaElement::JSHTMLTextAreaElement(PassRefPtr<Structure> structure, Pa { } -JSObject* JSHTMLTextAreaElement::createPrototype(ExecState* exec) +JSObject* JSHTMLTextAreaElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLTextAreaElementPrototype(JSHTMLTextAreaElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLTextAreaElementPrototype(JSHTMLTextAreaElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLTextAreaElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -151,173 +151,188 @@ bool JSHTMLTextAreaElement::getOwnPropertySlot(ExecState* exec, const Identifier return getStaticValueSlot<JSHTMLTextAreaElement, Base>(exec, &JSHTMLTextAreaElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLTextAreaElementDefaultValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTextAreaElementDefaultValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->defaultValue()); } -JSValuePtr jsHTMLTextAreaElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTextAreaElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->form())); } -JSValuePtr jsHTMLTextAreaElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTextAreaElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->accessKey()); } -JSValuePtr jsHTMLTextAreaElementCols(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTextAreaElementCols(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->cols()); } -JSValuePtr jsHTMLTextAreaElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTextAreaElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->disabled()); } -JSValuePtr jsHTMLTextAreaElementAutofocus(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTextAreaElementAutofocus(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->autofocus()); } -JSValuePtr jsHTMLTextAreaElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTextAreaElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsHTMLTextAreaElementReadOnly(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTextAreaElementReadOnly(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->readOnly()); } -JSValuePtr jsHTMLTextAreaElementRows(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTextAreaElementRows(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->rows()); } -JSValuePtr jsHTMLTextAreaElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTextAreaElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsHTMLTextAreaElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTextAreaElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->value()); } -JSValuePtr jsHTMLTextAreaElementWillValidate(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTextAreaElementWillValidate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->willValidate()); } -JSValuePtr jsHTMLTextAreaElementSelectionStart(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTextAreaElementSelectionStart(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->selectionStart()); } -JSValuePtr jsHTMLTextAreaElementSelectionEnd(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTextAreaElementSelectionEnd(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->selectionEnd()); } -JSValuePtr jsHTMLTextAreaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTextAreaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLTextAreaElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLTextAreaElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLTextAreaElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLTextAreaElement, Base>(exec, propertyName, value, &JSHTMLTextAreaElementTable, this, slot); } -void setJSHTMLTextAreaElementDefaultValue(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTextAreaElementDefaultValue(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(thisObject)->impl()); imp->setDefaultValue(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTextAreaElementAccessKey(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTextAreaElementAccessKey(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(thisObject)->impl()); imp->setAccessKey(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTextAreaElementCols(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTextAreaElementCols(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(thisObject)->impl()); - imp->setCols(value->toInt32(exec)); + imp->setCols(value.toInt32(exec)); } -void setJSHTMLTextAreaElementDisabled(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTextAreaElementDisabled(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(thisObject)->impl()); - imp->setDisabled(value->toBoolean(exec)); + imp->setDisabled(value.toBoolean(exec)); } -void setJSHTMLTextAreaElementAutofocus(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTextAreaElementAutofocus(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(thisObject)->impl()); - imp->setAutofocus(value->toBoolean(exec)); + imp->setAutofocus(value.toBoolean(exec)); } -void setJSHTMLTextAreaElementName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTextAreaElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(thisObject)->impl()); imp->setName(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTextAreaElementReadOnly(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTextAreaElementReadOnly(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(thisObject)->impl()); - imp->setReadOnly(value->toBoolean(exec)); + imp->setReadOnly(value.toBoolean(exec)); } -void setJSHTMLTextAreaElementRows(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTextAreaElementRows(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(thisObject)->impl()); - imp->setRows(value->toInt32(exec)); + imp->setRows(value.toInt32(exec)); } -void setJSHTMLTextAreaElementValue(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTextAreaElementValue(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(thisObject)->impl()); imp->setValue(valueToStringWithNullCheck(exec, value)); } -void setJSHTMLTextAreaElementSelectionStart(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTextAreaElementSelectionStart(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(thisObject)->impl()); - imp->setSelectionStart(value->toInt32(exec)); + imp->setSelectionStart(value.toInt32(exec)); } -void setJSHTMLTextAreaElementSelectionEnd(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTextAreaElementSelectionEnd(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(static_cast<JSHTMLTextAreaElement*>(thisObject)->impl()); - imp->setSelectionEnd(value->toInt32(exec)); + imp->setSelectionEnd(value.toInt32(exec)); } -JSValuePtr JSHTMLTextAreaElement::getConstructor(ExecState* exec) +JSValue JSHTMLTextAreaElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLTextAreaElementConstructor>(exec); } -JSValuePtr jsHTMLTextAreaElementPrototypeFunctionSelect(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLTextAreaElementPrototypeFunctionSelect(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLTextAreaElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLTextAreaElement::s_info)) return throwError(exec, TypeError); JSHTMLTextAreaElement* castedThisObj = static_cast<JSHTMLTextAreaElement*>(asObject(thisValue)); HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(castedThisObj->impl()); @@ -326,14 +341,15 @@ JSValuePtr jsHTMLTextAreaElementPrototypeFunctionSelect(ExecState* exec, JSObjec return jsUndefined(); } -JSValuePtr jsHTMLTextAreaElementPrototypeFunctionSetSelectionRange(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHTMLTextAreaElementPrototypeFunctionSetSelectionRange(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHTMLTextAreaElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHTMLTextAreaElement::s_info)) return throwError(exec, TypeError); JSHTMLTextAreaElement* castedThisObj = static_cast<JSHTMLTextAreaElement*>(asObject(thisValue)); HTMLTextAreaElement* imp = static_cast<HTMLTextAreaElement*>(castedThisObj->impl()); - int start = args.at(exec, 0)->toInt32(exec); - int end = args.at(exec, 1)->toInt32(exec); + int start = args.at(0).toInt32(exec); + int end = args.at(1).toInt32(exec); imp->setSelectionRange(start, end); return jsUndefined(); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.h index d50c32201c..d248975fde 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.h @@ -31,28 +31,29 @@ class JSHTMLTextAreaElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLTextAreaElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLTextAreaElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLTextAreaElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -61,36 +62,36 @@ public: // Functions -JSC::JSValuePtr jsHTMLTextAreaElementPrototypeFunctionSelect(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHTMLTextAreaElementPrototypeFunctionSetSelectionRange(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLTextAreaElementPrototypeFunctionSelect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHTMLTextAreaElementPrototypeFunctionSetSelectionRange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHTMLTextAreaElementDefaultValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTextAreaElementDefaultValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTextAreaElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLTextAreaElementAccessKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTextAreaElementAccessKey(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTextAreaElementCols(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTextAreaElementCols(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTextAreaElementDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTextAreaElementDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTextAreaElementAutofocus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTextAreaElementAutofocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTextAreaElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTextAreaElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTextAreaElementReadOnly(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTextAreaElementReadOnly(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTextAreaElementRows(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTextAreaElementRows(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTextAreaElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLTextAreaElementValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTextAreaElementValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTextAreaElementWillValidate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLTextAreaElementSelectionStart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTextAreaElementSelectionStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTextAreaElementSelectionEnd(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTextAreaElementSelectionEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTextAreaElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTextAreaElementDefaultValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTextAreaElementDefaultValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTextAreaElementForm(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTextAreaElementAccessKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTextAreaElementAccessKey(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTextAreaElementCols(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTextAreaElementCols(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTextAreaElementDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTextAreaElementDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTextAreaElementAutofocus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTextAreaElementAutofocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTextAreaElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTextAreaElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTextAreaElementReadOnly(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTextAreaElementReadOnly(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTextAreaElementRows(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTextAreaElementRows(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTextAreaElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTextAreaElementValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTextAreaElementValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTextAreaElementWillValidate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTextAreaElementSelectionStart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTextAreaElementSelectionStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTextAreaElementSelectionEnd(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTextAreaElementSelectionEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTextAreaElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTitleElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTitleElement.cpp index b5b80aa19b..2834552839 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTitleElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTitleElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLTitleElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLTitleElement); /* Hash table */ @@ -71,13 +71,13 @@ public: JSHTMLTitleElementConstructor(ExecState* exec) : DOMObject(JSHTMLTitleElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLTitleElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLTitleElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -106,9 +106,9 @@ static const HashTable JSHTMLTitleElementPrototypeTable = const ClassInfo JSHTMLTitleElementPrototype::s_info = { "HTMLTitleElementPrototype", 0, &JSHTMLTitleElementPrototypeTable, 0 }; -JSObject* JSHTMLTitleElementPrototype::self(ExecState* exec) +JSObject* JSHTMLTitleElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLTitleElement>(exec); + return getDOMPrototype<JSHTMLTitleElement>(exec, globalObject); } const ClassInfo JSHTMLTitleElement::s_info = { "HTMLTitleElement", &JSHTMLElement::s_info, &JSHTMLTitleElementTable, 0 }; @@ -118,9 +118,9 @@ JSHTMLTitleElement::JSHTMLTitleElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSHTMLTitleElement::createPrototype(ExecState* exec) +JSObject* JSHTMLTitleElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLTitleElementPrototype(JSHTMLTitleElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLTitleElementPrototype(JSHTMLTitleElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLTitleElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,28 +128,29 @@ bool JSHTMLTitleElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSHTMLTitleElement, Base>(exec, &JSHTMLTitleElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLTitleElementText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTitleElementText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLTitleElement* imp = static_cast<HTMLTitleElement*>(static_cast<JSHTMLTitleElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->text()); } -JSValuePtr jsHTMLTitleElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLTitleElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLTitleElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLTitleElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLTitleElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLTitleElement, Base>(exec, propertyName, value, &JSHTMLTitleElementTable, this, slot); } -void setJSHTMLTitleElementText(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLTitleElementText(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTitleElement* imp = static_cast<HTMLTitleElement*>(static_cast<JSHTMLTitleElement*>(thisObject)->impl()); imp->setText(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLTitleElement::getConstructor(ExecState* exec) +JSValue JSHTMLTitleElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLTitleElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTitleElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLTitleElement.h index 3d8f6f6fe9..79e73aecc2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTitleElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTitleElement.h @@ -31,24 +31,25 @@ class JSHTMLTitleElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLTitleElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLTitleElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLTitleElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLTitleElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,9 +57,9 @@ public: // Attributes -JSC::JSValuePtr jsHTMLTitleElementText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLTitleElementText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLTitleElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLTitleElementText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTitleElementText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTitleElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLUListElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLUListElement.cpp index dccf7e3447..d33549a46b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLUListElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLUListElement.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLUListElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLUListElement); /* Hash table */ @@ -72,13 +72,13 @@ public: JSHTMLUListElementConstructor(ExecState* exec) : DOMObject(JSHTMLUListElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLUListElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLUListElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -107,9 +107,9 @@ static const HashTable JSHTMLUListElementPrototypeTable = const ClassInfo JSHTMLUListElementPrototype::s_info = { "HTMLUListElementPrototype", 0, &JSHTMLUListElementPrototypeTable, 0 }; -JSObject* JSHTMLUListElementPrototype::self(ExecState* exec) +JSObject* JSHTMLUListElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLUListElement>(exec); + return getDOMPrototype<JSHTMLUListElement>(exec, globalObject); } const ClassInfo JSHTMLUListElement::s_info = { "HTMLUListElement", &JSHTMLElement::s_info, &JSHTMLUListElementTable, 0 }; @@ -119,9 +119,9 @@ JSHTMLUListElement::JSHTMLUListElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSHTMLUListElement::createPrototype(ExecState* exec) +JSObject* JSHTMLUListElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLUListElementPrototype(JSHTMLUListElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLUListElementPrototype(JSHTMLUListElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLUListElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -129,40 +129,42 @@ bool JSHTMLUListElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSHTMLUListElement, Base>(exec, &JSHTMLUListElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLUListElementCompact(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLUListElementCompact(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLUListElement* imp = static_cast<HTMLUListElement*>(static_cast<JSHTMLUListElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->compact()); } -JSValuePtr jsHTMLUListElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLUListElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLUListElement* imp = static_cast<HTMLUListElement*>(static_cast<JSHTMLUListElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsHTMLUListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLUListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLUListElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLUListElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLUListElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLUListElement, Base>(exec, propertyName, value, &JSHTMLUListElementTable, this, slot); } -void setJSHTMLUListElementCompact(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLUListElementCompact(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLUListElement* imp = static_cast<HTMLUListElement*>(static_cast<JSHTMLUListElement*>(thisObject)->impl()); - imp->setCompact(value->toBoolean(exec)); + imp->setCompact(value.toBoolean(exec)); } -void setJSHTMLUListElementType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLUListElementType(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLUListElement* imp = static_cast<HTMLUListElement*>(static_cast<JSHTMLUListElement*>(thisObject)->impl()); imp->setType(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLUListElement::getConstructor(ExecState* exec) +JSValue JSHTMLUListElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLUListElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLUListElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLUListElement.h index 0511b340e7..339b5f027f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLUListElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLUListElement.h @@ -31,24 +31,25 @@ class JSHTMLUListElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLUListElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLUListElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLUListElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLUListElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,11 +57,11 @@ public: // Attributes -JSC::JSValuePtr jsHTMLUListElementCompact(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLUListElementCompact(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLUListElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLUListElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLUListElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLUListElementCompact(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLUListElementCompact(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLUListElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLUListElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLUListElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLVideoElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLVideoElement.cpp index 9e868e5287..e345647e8a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLVideoElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLVideoElement.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHTMLVideoElement) +ASSERT_CLASS_FITS_IN_CELL(JSHTMLVideoElement); /* Hash table */ @@ -78,13 +78,13 @@ public: JSHTMLVideoElementConstructor(ExecState* exec) : DOMObject(JSHTMLVideoElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLVideoElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLVideoElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -113,9 +113,9 @@ static const HashTable JSHTMLVideoElementPrototypeTable = const ClassInfo JSHTMLVideoElementPrototype::s_info = { "HTMLVideoElementPrototype", 0, &JSHTMLVideoElementPrototypeTable, 0 }; -JSObject* JSHTMLVideoElementPrototype::self(ExecState* exec) +JSObject* JSHTMLVideoElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLVideoElement>(exec); + return getDOMPrototype<JSHTMLVideoElement>(exec, globalObject); } const ClassInfo JSHTMLVideoElement::s_info = { "HTMLVideoElement", &JSHTMLMediaElement::s_info, &JSHTMLVideoElementTable, 0 }; @@ -125,9 +125,9 @@ JSHTMLVideoElement::JSHTMLVideoElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSHTMLVideoElement::createPrototype(ExecState* exec) +JSObject* JSHTMLVideoElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLVideoElementPrototype(JSHTMLVideoElementPrototype::createStructure(JSHTMLMediaElementPrototype::self(exec))); + return new (exec) JSHTMLVideoElementPrototype(JSHTMLVideoElementPrototype::createStructure(JSHTMLMediaElementPrototype::self(exec, globalObject))); } bool JSHTMLVideoElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -135,64 +135,69 @@ bool JSHTMLVideoElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSHTMLVideoElement, Base>(exec, &JSHTMLVideoElementTable, this, propertyName, slot); } -JSValuePtr jsHTMLVideoElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLVideoElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLVideoElement* imp = static_cast<HTMLVideoElement*>(static_cast<JSHTMLVideoElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->width()); } -JSValuePtr jsHTMLVideoElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLVideoElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLVideoElement* imp = static_cast<HTMLVideoElement*>(static_cast<JSHTMLVideoElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->height()); } -JSValuePtr jsHTMLVideoElementVideoWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLVideoElementVideoWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLVideoElement* imp = static_cast<HTMLVideoElement*>(static_cast<JSHTMLVideoElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->videoWidth()); } -JSValuePtr jsHTMLVideoElementVideoHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLVideoElementVideoHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLVideoElement* imp = static_cast<HTMLVideoElement*>(static_cast<JSHTMLVideoElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->videoHeight()); } -JSValuePtr jsHTMLVideoElementPoster(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLVideoElementPoster(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); HTMLVideoElement* imp = static_cast<HTMLVideoElement*>(static_cast<JSHTMLVideoElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->poster()); } -JSValuePtr jsHTMLVideoElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHTMLVideoElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSHTMLVideoElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSHTMLVideoElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHTMLVideoElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSHTMLVideoElement, Base>(exec, propertyName, value, &JSHTMLVideoElementTable, this, slot); } -void setJSHTMLVideoElementWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLVideoElementWidth(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLVideoElement* imp = static_cast<HTMLVideoElement*>(static_cast<JSHTMLVideoElement*>(thisObject)->impl()); - imp->setWidth(value->toInt32(exec)); + imp->setWidth(value.toInt32(exec)); } -void setJSHTMLVideoElementHeight(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLVideoElementHeight(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLVideoElement* imp = static_cast<HTMLVideoElement*>(static_cast<JSHTMLVideoElement*>(thisObject)->impl()); - imp->setHeight(value->toInt32(exec)); + imp->setHeight(value.toInt32(exec)); } -void setJSHTMLVideoElementPoster(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSHTMLVideoElementPoster(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLVideoElement* imp = static_cast<HTMLVideoElement*>(static_cast<JSHTMLVideoElement*>(thisObject)->impl()); imp->setPoster(valueToStringWithNullCheck(exec, value)); } -JSValuePtr JSHTMLVideoElement::getConstructor(ExecState* exec) +JSValue JSHTMLVideoElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSHTMLVideoElementConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLVideoElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLVideoElement.h index 5dc28ef3f1..9d7577ff90 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLVideoElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLVideoElement.h @@ -34,24 +34,25 @@ class JSHTMLVideoElement : public JSHTMLMediaElement { typedef JSHTMLMediaElement Base; public: JSHTMLVideoElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLVideoElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSHTMLVideoElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSHTMLVideoElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -59,15 +60,15 @@ public: // Attributes -JSC::JSValuePtr jsHTMLVideoElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLVideoElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLVideoElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLVideoElementHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLVideoElementVideoWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLVideoElementVideoHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsHTMLVideoElementPoster(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSHTMLVideoElementPoster(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsHTMLVideoElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLVideoElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLVideoElementWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLVideoElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLVideoElementHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLVideoElementVideoWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLVideoElementVideoHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHTMLVideoElementPoster(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLVideoElementPoster(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLVideoElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSHistory.cpp b/src/3rdparty/webkit/WebCore/generated/JSHistory.cpp index 45b5e3a8eb..015482f29e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHistory.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHistory.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSHistory) +ASSERT_CLASS_FITS_IN_CELL(JSHistory); /* Hash table */ @@ -70,9 +70,9 @@ static const HashTable JSHistoryPrototypeTable = const ClassInfo JSHistoryPrototype::s_info = { "HistoryPrototype", 0, &JSHistoryPrototypeTable, 0 }; -JSObject* JSHistoryPrototype::self(ExecState* exec) +JSObject* JSHistoryPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHistory>(exec); + return getDOMPrototype<JSHistory>(exec, globalObject); } bool JSHistoryPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -91,12 +91,11 @@ JSHistory::JSHistory(PassRefPtr<Structure> structure, PassRefPtr<History> impl) JSHistory::~JSHistory() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSHistory::createPrototype(ExecState* exec) +JSObject* JSHistory::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHistoryPrototype(JSHistoryPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSHistoryPrototype(JSHistoryPrototype::createStructure(globalObject->objectPrototype())); } bool JSHistory::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -106,13 +105,14 @@ bool JSHistory::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa return getStaticValueSlot<JSHistory, Base>(exec, &JSHistoryTable, this, propertyName, slot); } -JSValuePtr jsHistoryLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsHistoryLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); History* imp = static_cast<History*>(static_cast<JSHistory*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -void JSHistory::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSHistory::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { if (customPut(exec, propertyName, value, slot)) return; @@ -126,9 +126,10 @@ void JSHistory::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNam Base::getPropertyNames(exec, propertyNames); } -JSValuePtr jsHistoryPrototypeFunctionBack(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHistoryPrototypeFunctionBack(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHistory::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHistory::s_info)) return throwError(exec, TypeError); JSHistory* castedThisObj = static_cast<JSHistory*>(asObject(thisValue)); History* imp = static_cast<History*>(castedThisObj->impl()); @@ -137,9 +138,10 @@ JSValuePtr jsHistoryPrototypeFunctionBack(ExecState* exec, JSObject*, JSValuePtr return jsUndefined(); } -JSValuePtr jsHistoryPrototypeFunctionForward(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHistoryPrototypeFunctionForward(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHistory::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHistory::s_info)) return throwError(exec, TypeError); JSHistory* castedThisObj = static_cast<JSHistory*>(asObject(thisValue)); History* imp = static_cast<History*>(castedThisObj->impl()); @@ -148,25 +150,26 @@ JSValuePtr jsHistoryPrototypeFunctionForward(ExecState* exec, JSObject*, JSValue return jsUndefined(); } -JSValuePtr jsHistoryPrototypeFunctionGo(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsHistoryPrototypeFunctionGo(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSHistory::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSHistory::s_info)) return throwError(exec, TypeError); JSHistory* castedThisObj = static_cast<JSHistory*>(asObject(thisValue)); History* imp = static_cast<History*>(castedThisObj->impl()); - int distance = args.at(exec, 0)->toInt32(exec); + int distance = args.at(0).toInt32(exec); imp->go(distance); return jsUndefined(); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, History* object) +JSC::JSValue toJS(JSC::ExecState* exec, History* object) { return getDOMObjectWrapper<JSHistory>(exec, object); } -History* toHistory(JSC::JSValuePtr value) +History* toHistory(JSC::JSValue value) { - return value->isObject(&JSHistory::s_info) ? static_cast<JSHistory*>(asObject(value))->impl() : 0; + return value.isObject(&JSHistory::s_info) ? static_cast<JSHistory*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHistory.h b/src/3rdparty/webkit/WebCore/generated/JSHistory.h index 6ff263d77e..f10e463a1e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHistory.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHistory.h @@ -34,15 +34,15 @@ class JSHistory : public DOMObject { public: JSHistory(PassRefPtr<JSC::Structure>, PassRefPtr<History>); virtual ~JSHistory(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); bool customGetOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); - bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); + bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -56,16 +56,17 @@ private: RefPtr<History> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, History*); -History* toHistory(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, History*); +History* toHistory(JSC::JSValue); class JSHistoryPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -74,12 +75,12 @@ public: // Functions -JSC::JSValuePtr jsHistoryPrototypeFunctionBack(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHistoryPrototypeFunctionForward(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsHistoryPrototypeFunctionGo(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHistoryPrototypeFunctionBack(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHistoryPrototypeFunctionForward(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsHistoryPrototypeFunctionGo(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsHistoryLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsHistoryLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSImageData.cpp b/src/3rdparty/webkit/WebCore/generated/JSImageData.cpp index a92adaadc7..17bd1fbacd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSImageData.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSImageData.cpp @@ -32,7 +32,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSImageData) +ASSERT_CLASS_FITS_IN_CELL(JSImageData); /* Hash table */ @@ -70,13 +70,13 @@ public: JSImageDataConstructor(ExecState* exec) : DOMObject(JSImageDataConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSImageDataPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSImageDataPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -105,9 +105,9 @@ static const HashTable JSImageDataPrototypeTable = const ClassInfo JSImageDataPrototype::s_info = { "ImageDataPrototype", 0, &JSImageDataPrototypeTable, 0 }; -JSObject* JSImageDataPrototype::self(ExecState* exec) +JSObject* JSImageDataPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSImageData>(exec); + return getDOMPrototype<JSImageData>(exec, globalObject); } const ClassInfo JSImageData::s_info = { "ImageData", 0, &JSImageDataTable, 0 }; @@ -121,12 +121,11 @@ JSImageData::JSImageData(PassRefPtr<Structure> structure, PassRefPtr<ImageData> JSImageData::~JSImageData() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSImageData::createPrototype(ExecState* exec) +JSObject* JSImageData::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSImageDataPrototype(JSImageDataPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSImageDataPrototype(JSImageDataPrototype::createStructure(globalObject->objectPrototype())); } bool JSImageData::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -134,30 +133,32 @@ bool JSImageData::getOwnPropertySlot(ExecState* exec, const Identifier& property return getStaticValueSlot<JSImageData, Base>(exec, &JSImageDataTable, this, propertyName, slot); } -JSValuePtr jsImageDataWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsImageDataWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); ImageData* imp = static_cast<ImageData*>(static_cast<JSImageData*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->width()); } -JSValuePtr jsImageDataHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsImageDataHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); ImageData* imp = static_cast<ImageData*>(static_cast<JSImageData*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->height()); } -JSValuePtr jsImageDataConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsImageDataConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSImageData*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSImageData::getConstructor(ExecState* exec) +JSValue JSImageData::getConstructor(ExecState* exec) { return getDOMConstructor<JSImageDataConstructor>(exec); } -ImageData* toImageData(JSC::JSValuePtr value) +ImageData* toImageData(JSC::JSValue value) { - return value->isObject(&JSImageData::s_info) ? static_cast<JSImageData*>(asObject(value))->impl() : 0; + return value.isObject(&JSImageData::s_info) ? static_cast<JSImageData*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSImageData.h b/src/3rdparty/webkit/WebCore/generated/JSImageData.h index a9e778a6de..12a9f014a4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSImageData.h +++ b/src/3rdparty/webkit/WebCore/generated/JSImageData.h @@ -34,29 +34,30 @@ class JSImageData : public DOMObject { public: JSImageData(PassRefPtr<JSC::Structure>, PassRefPtr<ImageData>); virtual ~JSImageData(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); ImageData* impl() const { return m_impl.get(); } private: RefPtr<ImageData> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, ImageData*); -ImageData* toImageData(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, ImageData*); +ImageData* toImageData(JSC::JSValue); class JSImageDataPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSImageDataPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -64,9 +65,9 @@ public: // Attributes -JSC::JSValuePtr jsImageDataWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsImageDataHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsImageDataConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsImageDataWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsImageDataHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsImageDataConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSInspectorController.cpp b/src/3rdparty/webkit/WebCore/generated/JSInspectorController.cpp new file mode 100644 index 0000000000..41cafef698 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSInspectorController.cpp @@ -0,0 +1,773 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "config.h" + +#include "JSInspectorController.h" + +#include <wtf/GetPtr.h> + +#include "DOMWindow.h" +#include "InspectorController.h" +#include "JSNode.h" +#include "KURL.h" +#include "Node.h" + +#include <runtime/Error.h> +#include <runtime/JSNumberCell.h> +#include <runtime/JSString.h> + +using namespace JSC; + +namespace WebCore { + +ASSERT_CLASS_FITS_IN_CELL(JSInspectorController); + +/* Hash table */ + +static const HashTableValue JSInspectorControllerTableValues[2] = +{ + { "constructor", DontEnum|ReadOnly, (intptr_t)jsInspectorControllerConstructor, (intptr_t)0 }, + { 0, 0, 0, 0 } +}; + +static const HashTable JSInspectorControllerTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSInspectorControllerTableValues, 0 }; +#else + { 2, 1, JSInspectorControllerTableValues, 0 }; +#endif + +/* Hash table for constructor */ + +static const HashTableValue JSInspectorControllerConstructorTableValues[1] = +{ + { 0, 0, 0, 0 } +}; + +static const HashTable JSInspectorControllerConstructorTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSInspectorControllerConstructorTableValues, 0 }; +#else + { 1, 0, JSInspectorControllerConstructorTableValues, 0 }; +#endif + +class JSInspectorControllerConstructor : public DOMObject { +public: + JSInspectorControllerConstructor(ExecState* exec) + : DOMObject(JSInspectorControllerConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + { + putDirect(exec->propertyNames().prototype, JSInspectorControllerPrototype::self(exec, exec->lexicalGlobalObject()), None); + } + virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); + virtual const ClassInfo* classInfo() const { return &s_info; } + static const ClassInfo s_info; + + static PassRefPtr<Structure> createStructure(JSValue proto) + { + return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); + } +}; + +const ClassInfo JSInspectorControllerConstructor::s_info = { "InspectorControllerConstructor", 0, &JSInspectorControllerConstructorTable, 0 }; + +bool JSInspectorControllerConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot<JSInspectorControllerConstructor, DOMObject>(exec, &JSInspectorControllerConstructorTable, this, propertyName, slot); +} + +/* Hash table for prototype */ + +static const HashTableValue JSInspectorControllerPrototypeTableValues[48] = +{ + { "hideDOMNodeHighlight", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionHideDOMNodeHighlight, (intptr_t)0 }, + { "highlightDOMNode", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionHighlightDOMNode, (intptr_t)1 }, + { "loaded", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionLoaded, (intptr_t)0 }, + { "windowUnloading", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionWindowUnloading, (intptr_t)0 }, + { "attach", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionAttach, (intptr_t)0 }, + { "detach", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionDetach, (intptr_t)0 }, + { "closeWindow", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionCloseWindow, (intptr_t)0 }, + { "clearMessages", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionClearMessages, (intptr_t)0 }, + { "toggleNodeSearch", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionToggleNodeSearch, (intptr_t)0 }, + { "isWindowVisible", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionIsWindowVisible, (intptr_t)0 }, + { "searchingForNode", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionSearchingForNode, (intptr_t)0 }, + { "addResourceSourceToFrame", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionAddResourceSourceToFrame, (intptr_t)2 }, + { "addSourceToFrame", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionAddSourceToFrame, (intptr_t)3 }, + { "getResourceDocumentNode", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionGetResourceDocumentNode, (intptr_t)1 }, + { "search", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionSearch, (intptr_t)2 }, + { "databaseTableNames", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionDatabaseTableNames, (intptr_t)1 }, + { "setting", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionSetting, (intptr_t)1 }, + { "setSetting", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionSetSetting, (intptr_t)2 }, + { "inspectedWindow", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionInspectedWindow, (intptr_t)0 }, + { "localizedStringsURL", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionLocalizedStringsURL, (intptr_t)0 }, + { "hiddenPanels", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionHiddenPanels, (intptr_t)0 }, + { "platform", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionPlatform, (intptr_t)0 }, + { "moveByUnrestricted", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionMoveByUnrestricted, (intptr_t)2 }, + { "setAttachedWindowHeight", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionSetAttachedWindowHeight, (intptr_t)1 }, + { "wrapCallback", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionWrapCallback, (intptr_t)1 }, + { "resourceTrackingEnabled", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionResourceTrackingEnabled, (intptr_t)0 }, + { "enableResourceTracking", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionEnableResourceTracking, (intptr_t)1 }, + { "disableResourceTracking", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionDisableResourceTracking, (intptr_t)1 }, + { "enableDebuggerFromFrontend", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionEnableDebuggerFromFrontend, (intptr_t)1 }, + { "disableDebugger", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionDisableDebugger, (intptr_t)1 }, + { "pauseInDebugger", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionPauseInDebugger, (intptr_t)0 }, + { "resumeDebugger", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionResumeDebugger, (intptr_t)0 }, + { "stepOverStatementInDebugger", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionStepOverStatementInDebugger, (intptr_t)0 }, + { "stepIntoStatementInDebugger", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionStepIntoStatementInDebugger, (intptr_t)0 }, + { "stepOutOfFunctionInDebugger", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionStepOutOfFunctionInDebugger, (intptr_t)0 }, + { "debuggerEnabled", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionDebuggerEnabled, (intptr_t)0 }, + { "pauseOnExceptions", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionPauseOnExceptions, (intptr_t)0 }, + { "profilerEnabled", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionProfilerEnabled, (intptr_t)0 }, + { "startProfiling", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionStartProfiling, (intptr_t)0 }, + { "stopProfiling", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionStopProfiling, (intptr_t)0 }, + { "enableProfiler", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionEnableProfiler, (intptr_t)1 }, + { "disableProfiler", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionDisableProfiler, (intptr_t)1 }, + { "currentCallFrame", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionCurrentCallFrame, (intptr_t)0 }, + { "setPauseOnExceptions", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionSetPauseOnExceptions, (intptr_t)1 }, + { "addBreakpoint", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionAddBreakpoint, (intptr_t)2 }, + { "removeBreakpoint", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionRemoveBreakpoint, (intptr_t)2 }, + { "profiles", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionProfiles, (intptr_t)0 }, + { 0, 0, 0, 0 } +}; + +static const HashTable JSInspectorControllerPrototypeTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 2047, JSInspectorControllerPrototypeTableValues, 0 }; +#else + { 137, 127, JSInspectorControllerPrototypeTableValues, 0 }; +#endif + +const ClassInfo JSInspectorControllerPrototype::s_info = { "InspectorControllerPrototype", 0, &JSInspectorControllerPrototypeTable, 0 }; + +JSObject* JSInspectorControllerPrototype::self(ExecState* exec, JSGlobalObject* globalObject) +{ + return getDOMPrototype<JSInspectorController>(exec, globalObject); +} + +bool JSInspectorControllerPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticFunctionSlot<JSObject>(exec, &JSInspectorControllerPrototypeTable, this, propertyName, slot); +} + +const ClassInfo JSInspectorController::s_info = { "InspectorController", 0, &JSInspectorControllerTable, 0 }; + +JSInspectorController::JSInspectorController(PassRefPtr<Structure> structure, PassRefPtr<InspectorController> impl) + : DOMObject(structure) + , m_impl(impl) +{ +} + +JSInspectorController::~JSInspectorController() +{ + forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); +} + +JSObject* JSInspectorController::createPrototype(ExecState* exec, JSGlobalObject* globalObject) +{ + return new (exec) JSInspectorControllerPrototype(JSInspectorControllerPrototype::createStructure(globalObject->objectPrototype())); +} + +bool JSInspectorController::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot<JSInspectorController, Base>(exec, &JSInspectorControllerTable, this, propertyName, slot); +} + +JSValue jsInspectorControllerConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + return static_cast<JSInspectorController*>(asObject(slot.slotBase()))->getConstructor(exec); +} +JSValue JSInspectorController::getConstructor(ExecState* exec) +{ + return getDOMConstructor<JSInspectorControllerConstructor>(exec); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionHideDOMNodeHighlight(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + imp->hideHighlight(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionHighlightDOMNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + return castedThisObj->highlightDOMNode(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionLoaded(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + imp->scriptObjectReady(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionWindowUnloading(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + imp->close(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionAttach(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + imp->attachWindow(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDetach(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + imp->detachWindow(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionCloseWindow(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + imp->closeWindow(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionClearMessages(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + imp->clearConsoleMessages(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionToggleNodeSearch(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + imp->toggleSearchForNodeInPage(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionIsWindowVisible(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + + JSC::JSValue result = jsBoolean(imp->windowVisible()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSearchingForNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + + JSC::JSValue result = jsBoolean(imp->searchingForNodeInPage()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionAddResourceSourceToFrame(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + int identifier = args.at(0).toInt32(exec); + Node* frame = toNode(args.at(1)); + + imp->addResourceSourceToFrame(identifier, frame); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionAddSourceToFrame(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + const UString& mimeType = args.at(0).toString(exec); + const UString& sourceValue = args.at(1).toString(exec); + Node* frame = toNode(args.at(2)); + + + JSC::JSValue result = jsBoolean(imp->addSourceToFrame(mimeType, sourceValue, frame)); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionGetResourceDocumentNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + return castedThisObj->getResourceDocumentNode(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSearch(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + return castedThisObj->search(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDatabaseTableNames(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + return castedThisObj->databaseTableNames(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSetting(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + return castedThisObj->setting(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSetSetting(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + return castedThisObj->setSetting(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionInspectedWindow(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + return castedThisObj->inspectedWindow(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionLocalizedStringsURL(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + + JSC::JSValue result = jsString(exec, imp->localizedStringsURL()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionHiddenPanels(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + + JSC::JSValue result = jsString(exec, imp->hiddenPanels()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionPlatform(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + + JSC::JSValue result = jsString(exec, imp->platform()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionMoveByUnrestricted(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); + + imp->moveWindowBy(x, y); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSetAttachedWindowHeight(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + unsigned height = args.at(0).toInt32(exec); + + imp->setAttachedWindowHeight(height); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionWrapCallback(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + return castedThisObj->wrapCallback(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionResourceTrackingEnabled(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + + JSC::JSValue result = jsBoolean(imp->resourceTrackingEnabled()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionEnableResourceTracking(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + bool always = args.at(0).toBoolean(exec); + + imp->enableResourceTracking(always); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDisableResourceTracking(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + bool always = args.at(0).toBoolean(exec); + + imp->disableResourceTracking(always); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionEnableDebuggerFromFrontend(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + bool always = args.at(0).toBoolean(exec); + + imp->enableDebuggerFromFrontend(always); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDisableDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + bool always = args.at(0).toBoolean(exec); + + imp->disableDebugger(always); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionPauseInDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + imp->pauseInDebugger(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionResumeDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + imp->resumeDebugger(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStepOverStatementInDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + imp->stepOverStatementInDebugger(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStepIntoStatementInDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + imp->stepIntoStatementInDebugger(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStepOutOfFunctionInDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + imp->stepOutOfFunctionInDebugger(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDebuggerEnabled(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + + JSC::JSValue result = jsBoolean(imp->debuggerEnabled()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionPauseOnExceptions(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + + JSC::JSValue result = jsBoolean(imp->pauseOnExceptions()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionProfilerEnabled(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + + JSC::JSValue result = jsBoolean(imp->profilerEnabled()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStartProfiling(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + imp->startUserInitiatedProfiling(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStopProfiling(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + + imp->stopUserInitiatedProfiling(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionEnableProfiler(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + bool always = args.at(0).toBoolean(exec); + + imp->enableProfiler(always); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDisableProfiler(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + bool always = args.at(0).toBoolean(exec); + + imp->disableProfiler(always); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionCurrentCallFrame(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + return castedThisObj->currentCallFrame(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSetPauseOnExceptions(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + bool pauseOnExceptions = args.at(0).toBoolean(exec); + + imp->setPauseOnExceptions(pauseOnExceptions); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionAddBreakpoint(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + unsigned sourceID = args.at(0).toInt32(exec); + unsigned lineNumber = args.at(1).toInt32(exec); + + imp->addBreakpoint(sourceID, lineNumber); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionRemoveBreakpoint(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + InspectorController* imp = static_cast<InspectorController*>(castedThisObj->impl()); + unsigned sourceID = args.at(0).toInt32(exec); + unsigned lineNumber = args.at(1).toInt32(exec); + + imp->removeBreakpoint(sourceID, lineNumber); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionProfiles(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorController::s_info)) + return throwError(exec, TypeError); + JSInspectorController* castedThisObj = static_cast<JSInspectorController*>(asObject(thisValue)); + return castedThisObj->profiles(exec, args); +} + +JSC::JSValue toJS(JSC::ExecState* exec, InspectorController* object) +{ + return getDOMObjectWrapper<JSInspectorController>(exec, object); +} +InspectorController* toInspectorController(JSC::JSValue value) +{ + return value.isObject(&JSInspectorController::s_info) ? static_cast<JSInspectorController*>(asObject(value))->impl() : 0; +} + +} diff --git a/src/3rdparty/webkit/WebCore/generated/JSInspectorController.h b/src/3rdparty/webkit/WebCore/generated/JSInspectorController.h new file mode 100644 index 0000000000..3bb1480d0c --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSInspectorController.h @@ -0,0 +1,138 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef JSInspectorController_h +#define JSInspectorController_h + +#include "JSDOMBinding.h" +#include <runtime/JSGlobalObject.h> +#include <runtime/ObjectPrototype.h> + +namespace WebCore { + +class InspectorController; + +class JSInspectorController : public DOMObject { + typedef DOMObject Base; +public: + JSInspectorController(PassRefPtr<JSC::Structure>, PassRefPtr<InspectorController>); + virtual ~JSInspectorController(); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + + static JSC::JSValue getConstructor(JSC::ExecState*); + + // Custom functions + JSC::JSValue highlightDOMNode(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue getResourceDocumentNode(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue search(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue databaseTableNames(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setting(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setSetting(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue inspectedWindow(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue wrapCallback(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue currentCallFrame(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue profiles(JSC::ExecState*, const JSC::ArgList&); + InspectorController* impl() const { return m_impl.get(); } + +private: + RefPtr<InspectorController> m_impl; +}; + +JSC::JSValue toJS(JSC::ExecState*, InspectorController*); +InspectorController* toInspectorController(JSC::JSValue); + +class JSInspectorControllerPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; +public: + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + JSInspectorControllerPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } +}; + +// Functions + +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionHideDOMNodeHighlight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionHighlightDOMNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionLoaded(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionWindowUnloading(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionAttach(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDetach(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionCloseWindow(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionClearMessages(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionToggleNodeSearch(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionIsWindowVisible(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSearchingForNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionAddResourceSourceToFrame(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionAddSourceToFrame(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionGetResourceDocumentNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSearch(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDatabaseTableNames(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSetting(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSetSetting(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionInspectedWindow(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionLocalizedStringsURL(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionHiddenPanels(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionPlatform(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionMoveByUnrestricted(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSetAttachedWindowHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionWrapCallback(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionResourceTrackingEnabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionEnableResourceTracking(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDisableResourceTracking(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionEnableDebuggerFromFrontend(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDisableDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionPauseInDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionResumeDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStepOverStatementInDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStepIntoStatementInDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStepOutOfFunctionInDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDebuggerEnabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionPauseOnExceptions(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionProfilerEnabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStartProfiling(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStopProfiling(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionEnableProfiler(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDisableProfiler(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionCurrentCallFrame(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSetPauseOnExceptions(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionAddBreakpoint(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionRemoveBreakpoint(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionProfiles(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +// Attributes + +JSC::JSValue jsInspectorControllerConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + +} // namespace WebCore + +#endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.cpp b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.cpp index 6b60c21f29..924753ac95 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.cpp @@ -20,6 +20,9 @@ #include "config.h" + +#if ENABLE(JAVASCRIPT_DEBUGGER) + #include "JSJavaScriptCallFrame.h" #include <wtf/GetPtr.h> @@ -36,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSJavaScriptCallFrame) +ASSERT_CLASS_FITS_IN_CELL(JSJavaScriptCallFrame); /* Hash table */ @@ -76,9 +79,9 @@ static const HashTable JSJavaScriptCallFramePrototypeTable = const ClassInfo JSJavaScriptCallFramePrototype::s_info = { "JavaScriptCallFramePrototype", 0, &JSJavaScriptCallFramePrototypeTable, 0 }; -JSObject* JSJavaScriptCallFramePrototype::self(ExecState* exec) +JSObject* JSJavaScriptCallFramePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSJavaScriptCallFrame>(exec); + return getDOMPrototype<JSJavaScriptCallFrame>(exec, globalObject); } bool JSJavaScriptCallFramePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -97,12 +100,11 @@ JSJavaScriptCallFrame::JSJavaScriptCallFrame(PassRefPtr<Structure> structure, Pa JSJavaScriptCallFrame::~JSJavaScriptCallFrame() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSJavaScriptCallFrame::createPrototype(ExecState* exec) +JSObject* JSJavaScriptCallFrame::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSJavaScriptCallFramePrototype(JSJavaScriptCallFramePrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSJavaScriptCallFramePrototype(JSJavaScriptCallFramePrototype::createStructure(globalObject->objectPrototype())); } bool JSJavaScriptCallFrame::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -110,60 +112,67 @@ bool JSJavaScriptCallFrame::getOwnPropertySlot(ExecState* exec, const Identifier return getStaticValueSlot<JSJavaScriptCallFrame, Base>(exec, &JSJavaScriptCallFrameTable, this, propertyName, slot); } -JSValuePtr jsJavaScriptCallFrameCaller(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsJavaScriptCallFrameCaller(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); JavaScriptCallFrame* imp = static_cast<JavaScriptCallFrame*>(static_cast<JSJavaScriptCallFrame*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->caller())); } -JSValuePtr jsJavaScriptCallFrameSourceID(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsJavaScriptCallFrameSourceID(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); JavaScriptCallFrame* imp = static_cast<JavaScriptCallFrame*>(static_cast<JSJavaScriptCallFrame*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->sourceID()); } -JSValuePtr jsJavaScriptCallFrameLine(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsJavaScriptCallFrameLine(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); JavaScriptCallFrame* imp = static_cast<JavaScriptCallFrame*>(static_cast<JSJavaScriptCallFrame*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->line()); } -JSValuePtr jsJavaScriptCallFrameScopeChain(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsJavaScriptCallFrameScopeChain(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSJavaScriptCallFrame*>(asObject(slot.slotBase()))->scopeChain(exec); } -JSValuePtr jsJavaScriptCallFrameThisObject(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsJavaScriptCallFrameThisObject(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSJavaScriptCallFrame*>(asObject(slot.slotBase()))->thisObject(exec); } -JSValuePtr jsJavaScriptCallFrameFunctionName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsJavaScriptCallFrameFunctionName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); JavaScriptCallFrame* imp = static_cast<JavaScriptCallFrame*>(static_cast<JSJavaScriptCallFrame*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->functionName()); } -JSValuePtr jsJavaScriptCallFrameType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsJavaScriptCallFrameType(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSJavaScriptCallFrame*>(asObject(slot.slotBase()))->type(exec); } -JSValuePtr jsJavaScriptCallFramePrototypeFunctionEvaluate(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsJavaScriptCallFramePrototypeFunctionEvaluate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSJavaScriptCallFrame::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSJavaScriptCallFrame::s_info)) return throwError(exec, TypeError); JSJavaScriptCallFrame* castedThisObj = static_cast<JSJavaScriptCallFrame*>(asObject(thisValue)); return castedThisObj->evaluate(exec, args); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, JavaScriptCallFrame* object) +JSC::JSValue toJS(JSC::ExecState* exec, JavaScriptCallFrame* object) { return getDOMObjectWrapper<JSJavaScriptCallFrame>(exec, object); } -JavaScriptCallFrame* toJavaScriptCallFrame(JSC::JSValuePtr value) +JavaScriptCallFrame* toJavaScriptCallFrame(JSC::JSValue value) { - return value->isObject(&JSJavaScriptCallFrame::s_info) ? static_cast<JSJavaScriptCallFrame*>(asObject(value))->impl() : 0; + return value.isObject(&JSJavaScriptCallFrame::s_info) ? static_cast<JSJavaScriptCallFrame*>(asObject(value))->impl() : 0; } } + +#endif // ENABLE(JAVASCRIPT_DEBUGGER) diff --git a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h index 9f1ca084f1..12a5810a59 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h +++ b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h @@ -21,6 +21,9 @@ #ifndef JSJavaScriptCallFrame_h #define JSJavaScriptCallFrame_h + +#if ENABLE(JAVASCRIPT_DEBUGGER) + #include "JSDOMBinding.h" #include <runtime/JSGlobalObject.h> #include <runtime/ObjectPrototype.h> @@ -34,40 +37,41 @@ class JSJavaScriptCallFrame : public DOMObject { public: JSJavaScriptCallFrame(PassRefPtr<JSC::Structure>, PassRefPtr<JavaScriptCallFrame>); virtual ~JSJavaScriptCallFrame(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } // Custom attributes - JSC::JSValuePtr scopeChain(JSC::ExecState*) const; - JSC::JSValuePtr thisObject(JSC::ExecState*) const; - JSC::JSValuePtr type(JSC::ExecState*) const; + JSC::JSValue scopeChain(JSC::ExecState*) const; + JSC::JSValue thisObject(JSC::ExecState*) const; + JSC::JSValue type(JSC::ExecState*) const; // Custom functions - JSC::JSValuePtr evaluate(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue evaluate(JSC::ExecState*, const JSC::ArgList&); JavaScriptCallFrame* impl() const { return m_impl.get(); } private: RefPtr<JavaScriptCallFrame> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, JavaScriptCallFrame*); -JavaScriptCallFrame* toJavaScriptCallFrame(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, JavaScriptCallFrame*); +JavaScriptCallFrame* toJavaScriptCallFrame(JSC::JSValue); class JSJavaScriptCallFramePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -76,17 +80,19 @@ public: // Functions -JSC::JSValuePtr jsJavaScriptCallFramePrototypeFunctionEvaluate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsJavaScriptCallFramePrototypeFunctionEvaluate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsJavaScriptCallFrameCaller(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsJavaScriptCallFrameSourceID(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsJavaScriptCallFrameLine(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsJavaScriptCallFrameScopeChain(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsJavaScriptCallFrameThisObject(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsJavaScriptCallFrameFunctionName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsJavaScriptCallFrameType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsJavaScriptCallFrameCaller(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsJavaScriptCallFrameSourceID(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsJavaScriptCallFrameLine(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsJavaScriptCallFrameScopeChain(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsJavaScriptCallFrameThisObject(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsJavaScriptCallFrameFunctionName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsJavaScriptCallFrameType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore +#endif // ENABLE(JAVASCRIPT_DEBUGGER) + #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSKeyboardEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSKeyboardEvent.cpp index 14dea9cbc0..107023be32 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSKeyboardEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSKeyboardEvent.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSKeyboardEvent) +ASSERT_CLASS_FITS_IN_CELL(JSKeyboardEvent); /* Hash table */ @@ -79,13 +79,13 @@ public: JSKeyboardEventConstructor(ExecState* exec) : DOMObject(JSKeyboardEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSKeyboardEventPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSKeyboardEventPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -115,9 +115,9 @@ static const HashTable JSKeyboardEventPrototypeTable = const ClassInfo JSKeyboardEventPrototype::s_info = { "KeyboardEventPrototype", 0, &JSKeyboardEventPrototypeTable, 0 }; -JSObject* JSKeyboardEventPrototype::self(ExecState* exec) +JSObject* JSKeyboardEventPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSKeyboardEvent>(exec); + return getDOMPrototype<JSKeyboardEvent>(exec, globalObject); } bool JSKeyboardEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -132,9 +132,9 @@ JSKeyboardEvent::JSKeyboardEvent(PassRefPtr<Structure> structure, PassRefPtr<Key { } -JSObject* JSKeyboardEvent::createPrototype(ExecState* exec) +JSObject* JSKeyboardEvent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSKeyboardEventPrototype(JSKeyboardEventPrototype::createStructure(JSUIEventPrototype::self(exec))); + return new (exec) JSKeyboardEventPrototype(JSKeyboardEventPrototype::createStructure(JSUIEventPrototype::self(exec, globalObject))); } bool JSKeyboardEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -142,74 +142,82 @@ bool JSKeyboardEvent::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSKeyboardEvent, Base>(exec, &JSKeyboardEventTable, this, propertyName, slot); } -JSValuePtr jsKeyboardEventKeyIdentifier(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsKeyboardEventKeyIdentifier(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); KeyboardEvent* imp = static_cast<KeyboardEvent*>(static_cast<JSKeyboardEvent*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->keyIdentifier()); } -JSValuePtr jsKeyboardEventKeyLocation(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsKeyboardEventKeyLocation(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); KeyboardEvent* imp = static_cast<KeyboardEvent*>(static_cast<JSKeyboardEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->keyLocation()); } -JSValuePtr jsKeyboardEventCtrlKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsKeyboardEventCtrlKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); KeyboardEvent* imp = static_cast<KeyboardEvent*>(static_cast<JSKeyboardEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->ctrlKey()); } -JSValuePtr jsKeyboardEventShiftKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsKeyboardEventShiftKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); KeyboardEvent* imp = static_cast<KeyboardEvent*>(static_cast<JSKeyboardEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->shiftKey()); } -JSValuePtr jsKeyboardEventAltKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsKeyboardEventAltKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); KeyboardEvent* imp = static_cast<KeyboardEvent*>(static_cast<JSKeyboardEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->altKey()); } -JSValuePtr jsKeyboardEventMetaKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsKeyboardEventMetaKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); KeyboardEvent* imp = static_cast<KeyboardEvent*>(static_cast<JSKeyboardEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->metaKey()); } -JSValuePtr jsKeyboardEventAltGraphKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsKeyboardEventAltGraphKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); KeyboardEvent* imp = static_cast<KeyboardEvent*>(static_cast<JSKeyboardEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->altGraphKey()); } -JSValuePtr jsKeyboardEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsKeyboardEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSKeyboardEvent*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSKeyboardEvent::getConstructor(ExecState* exec) +JSValue JSKeyboardEvent::getConstructor(ExecState* exec) { return getDOMConstructor<JSKeyboardEventConstructor>(exec); } -JSValuePtr jsKeyboardEventPrototypeFunctionInitKeyboardEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsKeyboardEventPrototypeFunctionInitKeyboardEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSKeyboardEvent::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSKeyboardEvent::s_info)) return throwError(exec, TypeError); JSKeyboardEvent* castedThisObj = static_cast<JSKeyboardEvent*>(asObject(thisValue)); KeyboardEvent* imp = static_cast<KeyboardEvent*>(castedThisObj->impl()); - const UString& type = args.at(exec, 0)->toString(exec); - bool canBubble = args.at(exec, 1)->toBoolean(exec); - bool cancelable = args.at(exec, 2)->toBoolean(exec); - DOMWindow* view = toDOMWindow(args.at(exec, 3)); - const UString& keyIdentifier = args.at(exec, 4)->toString(exec); - unsigned keyLocation = args.at(exec, 5)->toInt32(exec); - bool ctrlKey = args.at(exec, 6)->toBoolean(exec); - bool altKey = args.at(exec, 7)->toBoolean(exec); - bool shiftKey = args.at(exec, 8)->toBoolean(exec); - bool metaKey = args.at(exec, 9)->toBoolean(exec); - bool altGraphKey = args.at(exec, 10)->toBoolean(exec); + const UString& type = args.at(0).toString(exec); + bool canBubble = args.at(1).toBoolean(exec); + bool cancelable = args.at(2).toBoolean(exec); + DOMWindow* view = toDOMWindow(args.at(3)); + const UString& keyIdentifier = args.at(4).toString(exec); + unsigned keyLocation = args.at(5).toInt32(exec); + bool ctrlKey = args.at(6).toBoolean(exec); + bool altKey = args.at(7).toBoolean(exec); + bool shiftKey = args.at(8).toBoolean(exec); + bool metaKey = args.at(9).toBoolean(exec); + bool altGraphKey = args.at(10).toBoolean(exec); imp->initKeyboardEvent(type, canBubble, cancelable, view, keyIdentifier, keyLocation, ctrlKey, altKey, shiftKey, metaKey, altGraphKey); return jsUndefined(); diff --git a/src/3rdparty/webkit/WebCore/generated/JSKeyboardEvent.h b/src/3rdparty/webkit/WebCore/generated/JSKeyboardEvent.h index c2d981adb5..40e6eb1c2f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSKeyboardEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSKeyboardEvent.h @@ -31,27 +31,28 @@ class JSKeyboardEvent : public JSUIEvent { typedef JSUIEvent Base; public: JSKeyboardEvent(PassRefPtr<JSC::Structure>, PassRefPtr<KeyboardEvent>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSKeyboardEventPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,17 +61,17 @@ public: // Functions -JSC::JSValuePtr jsKeyboardEventPrototypeFunctionInitKeyboardEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsKeyboardEventPrototypeFunctionInitKeyboardEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsKeyboardEventKeyIdentifier(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsKeyboardEventKeyLocation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsKeyboardEventCtrlKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsKeyboardEventShiftKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsKeyboardEventAltKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsKeyboardEventMetaKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsKeyboardEventAltGraphKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsKeyboardEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsKeyboardEventKeyIdentifier(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsKeyboardEventKeyLocation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsKeyboardEventCtrlKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsKeyboardEventShiftKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsKeyboardEventAltKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsKeyboardEventMetaKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsKeyboardEventAltGraphKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsKeyboardEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSLocation.cpp b/src/3rdparty/webkit/WebCore/generated/JSLocation.cpp index b1bbc16f9b..2f09ac828e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSLocation.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSLocation.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSLocation) +ASSERT_CLASS_FITS_IN_CELL(JSLocation); /* Hash table */ @@ -79,9 +79,9 @@ static const HashTable JSLocationPrototypeTable = const ClassInfo JSLocationPrototype::s_info = { "LocationPrototype", 0, &JSLocationPrototypeTable, 0 }; -JSObject* JSLocationPrototype::self(ExecState* exec) +JSObject* JSLocationPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSLocation>(exec); + return getDOMPrototype<JSLocation>(exec, globalObject); } bool JSLocationPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -89,6 +89,13 @@ bool JSLocationPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticFunctionSlot<JSObject>(exec, &JSLocationPrototypeTable, this, propertyName, slot); } +void JSLocationPrototype::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) +{ + if (customPut(exec, propertyName, value, slot)) + return; + Base::put(exec, propertyName, value, slot); +} + const ClassInfo JSLocation::s_info = { "Location", 0, &JSLocationTable, 0 }; JSLocation::JSLocation(PassRefPtr<Structure> structure, PassRefPtr<Location> impl) @@ -100,12 +107,11 @@ JSLocation::JSLocation(PassRefPtr<Structure> structure, PassRefPtr<Location> imp JSLocation::~JSLocation() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSLocation::createPrototype(ExecState* exec) +JSObject* JSLocation::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSLocationPrototype(JSLocationPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSLocationPrototype(JSLocationPrototype::createStructure(globalObject->objectPrototype())); } bool JSLocation::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -115,97 +121,105 @@ bool JSLocation::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN return getStaticValueSlot<JSLocation, Base>(exec, &JSLocationTable, this, propertyName, slot); } -JSValuePtr jsLocationHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsLocationHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Location* imp = static_cast<Location*>(static_cast<JSLocation*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->href()); } -JSValuePtr jsLocationProtocol(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsLocationProtocol(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Location* imp = static_cast<Location*>(static_cast<JSLocation*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->protocol()); } -JSValuePtr jsLocationHost(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsLocationHost(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Location* imp = static_cast<Location*>(static_cast<JSLocation*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->host()); } -JSValuePtr jsLocationHostname(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsLocationHostname(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Location* imp = static_cast<Location*>(static_cast<JSLocation*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->hostname()); } -JSValuePtr jsLocationPort(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsLocationPort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Location* imp = static_cast<Location*>(static_cast<JSLocation*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->port()); } -JSValuePtr jsLocationPathname(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsLocationPathname(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Location* imp = static_cast<Location*>(static_cast<JSLocation*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->pathname()); } -JSValuePtr jsLocationSearch(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsLocationSearch(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Location* imp = static_cast<Location*>(static_cast<JSLocation*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->search()); } -JSValuePtr jsLocationHash(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsLocationHash(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Location* imp = static_cast<Location*>(static_cast<JSLocation*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->hash()); } -void JSLocation::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSLocation::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { if (customPut(exec, propertyName, value, slot)) return; lookupPut<JSLocation, Base>(exec, propertyName, value, &JSLocationTable, this, slot); } -void setJSLocationHref(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSLocationHref(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSLocation*>(thisObject)->setHref(exec, value); } -void setJSLocationProtocol(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSLocationProtocol(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSLocation*>(thisObject)->setProtocol(exec, value); } -void setJSLocationHost(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSLocationHost(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSLocation*>(thisObject)->setHost(exec, value); } -void setJSLocationHostname(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSLocationHostname(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSLocation*>(thisObject)->setHostname(exec, value); } -void setJSLocationPort(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSLocationPort(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSLocation*>(thisObject)->setPort(exec, value); } -void setJSLocationPathname(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSLocationPathname(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSLocation*>(thisObject)->setPathname(exec, value); } -void setJSLocationSearch(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSLocationSearch(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSLocation*>(thisObject)->setSearch(exec, value); } -void setJSLocationHash(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSLocationHash(ExecState* exec, JSObject* thisObject, JSValue value) { static_cast<JSLocation*>(thisObject)->setHash(exec, value); } @@ -217,45 +231,49 @@ void JSLocation::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNa Base::getPropertyNames(exec, propertyNames); } -JSValuePtr jsLocationPrototypeFunctionAssign(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsLocationPrototypeFunctionAssign(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSLocation::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSLocation::s_info)) return throwError(exec, TypeError); JSLocation* castedThisObj = static_cast<JSLocation*>(asObject(thisValue)); return castedThisObj->assign(exec, args); } -JSValuePtr jsLocationPrototypeFunctionReplace(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsLocationPrototypeFunctionReplace(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSLocation::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSLocation::s_info)) return throwError(exec, TypeError); JSLocation* castedThisObj = static_cast<JSLocation*>(asObject(thisValue)); return castedThisObj->replace(exec, args); } -JSValuePtr jsLocationPrototypeFunctionReload(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsLocationPrototypeFunctionReload(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSLocation::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSLocation::s_info)) return throwError(exec, TypeError); JSLocation* castedThisObj = static_cast<JSLocation*>(asObject(thisValue)); return castedThisObj->reload(exec, args); } -JSValuePtr jsLocationPrototypeFunctionToString(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsLocationPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSLocation::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSLocation::s_info)) return throwError(exec, TypeError); JSLocation* castedThisObj = static_cast<JSLocation*>(asObject(thisValue)); return castedThisObj->toString(exec, args); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, Location* object) +JSC::JSValue toJS(JSC::ExecState* exec, Location* object) { return getDOMObjectWrapper<JSLocation>(exec, object); } -Location* toLocation(JSC::JSValuePtr value) +Location* toLocation(JSC::JSValue value) { - return value->isObject(&JSLocation::s_info) ? static_cast<JSLocation*>(asObject(value))->impl() : 0; + return value.isObject(&JSLocation::s_info) ? static_cast<JSLocation*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSLocation.h b/src/3rdparty/webkit/WebCore/generated/JSLocation.h index a4e8e742b1..7d83575f8b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSLocation.h +++ b/src/3rdparty/webkit/WebCore/generated/JSLocation.h @@ -34,15 +34,15 @@ class JSLocation : public DOMObject { public: JSLocation(PassRefPtr<JSC::Structure>, PassRefPtr<Location>); virtual ~JSLocation(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); bool customGetOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); - bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); + bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -50,68 +50,73 @@ public: virtual bool deleteProperty(JSC::ExecState*, const JSC::Identifier&); virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); bool customGetPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); + virtual void defineGetter(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSObject* getterFunction); // Custom attributes - void setHref(JSC::ExecState*, JSC::JSValuePtr); - void setProtocol(JSC::ExecState*, JSC::JSValuePtr); - void setHost(JSC::ExecState*, JSC::JSValuePtr); - void setHostname(JSC::ExecState*, JSC::JSValuePtr); - void setPort(JSC::ExecState*, JSC::JSValuePtr); - void setPathname(JSC::ExecState*, JSC::JSValuePtr); - void setSearch(JSC::ExecState*, JSC::JSValuePtr); - void setHash(JSC::ExecState*, JSC::JSValuePtr); + void setHref(JSC::ExecState*, JSC::JSValue); + void setProtocol(JSC::ExecState*, JSC::JSValue); + void setHost(JSC::ExecState*, JSC::JSValue); + void setHostname(JSC::ExecState*, JSC::JSValue); + void setPort(JSC::ExecState*, JSC::JSValue); + void setPathname(JSC::ExecState*, JSC::JSValue); + void setSearch(JSC::ExecState*, JSC::JSValue); + void setHash(JSC::ExecState*, JSC::JSValue); // Custom functions - JSC::JSValuePtr assign(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr replace(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr reload(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr toString(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue assign(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue replace(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue reload(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue toString(JSC::ExecState*, const JSC::ArgList&); Location* impl() const { return m_impl.get(); } private: RefPtr<Location> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, Location*); -Location* toLocation(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, Location*); +Location* toLocation(JSC::JSValue); class JSLocationPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); + bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValue, JSC::PutPropertySlot&); + virtual void defineGetter(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSObject* getterFunction); JSLocationPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } }; // Functions -JSC::JSValuePtr jsLocationPrototypeFunctionAssign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsLocationPrototypeFunctionReplace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsLocationPrototypeFunctionReload(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsLocationPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsLocationPrototypeFunctionAssign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsLocationPrototypeFunctionReplace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsLocationPrototypeFunctionReload(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsLocationPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsLocationHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSLocationHref(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsLocationProtocol(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSLocationProtocol(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsLocationHost(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSLocationHost(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsLocationHostname(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSLocationHostname(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsLocationPort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSLocationPort(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsLocationPathname(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSLocationPathname(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsLocationSearch(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSLocationSearch(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsLocationHash(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSLocationHash(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsLocationHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSLocationHref(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsLocationProtocol(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSLocationProtocol(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsLocationHost(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSLocationHost(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsLocationHostname(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSLocationHostname(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsLocationPort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSLocationPort(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsLocationPathname(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSLocationPathname(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsLocationSearch(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSLocationSearch(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsLocationHash(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSLocationHash(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSMediaError.cpp b/src/3rdparty/webkit/WebCore/generated/JSMediaError.cpp index 6789d9d5ab..107d706942 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMediaError.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMediaError.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSMediaError) +ASSERT_CLASS_FITS_IN_CELL(JSMediaError); /* Hash table */ @@ -55,19 +55,20 @@ static const HashTable JSMediaErrorTable = /* Hash table for constructor */ -static const HashTableValue JSMediaErrorConstructorTableValues[4] = +static const HashTableValue JSMediaErrorConstructorTableValues[5] = { { "MEDIA_ERR_ABORTED", DontDelete|ReadOnly, (intptr_t)jsMediaErrorMEDIA_ERR_ABORTED, (intptr_t)0 }, { "MEDIA_ERR_NETWORK", DontDelete|ReadOnly, (intptr_t)jsMediaErrorMEDIA_ERR_NETWORK, (intptr_t)0 }, { "MEDIA_ERR_DECODE", DontDelete|ReadOnly, (intptr_t)jsMediaErrorMEDIA_ERR_DECODE, (intptr_t)0 }, + { "MEDIA_ERR_SRC_NOT_SUPPORTED", DontDelete|ReadOnly, (intptr_t)jsMediaErrorMEDIA_ERR_SRC_NOT_SUPPORTED, (intptr_t)0 }, { 0, 0, 0, 0 } }; static const HashTable JSMediaErrorConstructorTable = #if ENABLE(PERFECT_HASH_SIZE) - { 3, JSMediaErrorConstructorTableValues, 0 }; + { 31, JSMediaErrorConstructorTableValues, 0 }; #else - { 8, 7, JSMediaErrorConstructorTableValues, 0 }; + { 9, 7, JSMediaErrorConstructorTableValues, 0 }; #endif class JSMediaErrorConstructor : public DOMObject { @@ -75,13 +76,13 @@ public: JSMediaErrorConstructor(ExecState* exec) : DOMObject(JSMediaErrorConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSMediaErrorPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSMediaErrorPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -96,26 +97,27 @@ bool JSMediaErrorConstructor::getOwnPropertySlot(ExecState* exec, const Identifi /* Hash table for prototype */ -static const HashTableValue JSMediaErrorPrototypeTableValues[4] = +static const HashTableValue JSMediaErrorPrototypeTableValues[5] = { { "MEDIA_ERR_ABORTED", DontDelete|ReadOnly, (intptr_t)jsMediaErrorMEDIA_ERR_ABORTED, (intptr_t)0 }, { "MEDIA_ERR_NETWORK", DontDelete|ReadOnly, (intptr_t)jsMediaErrorMEDIA_ERR_NETWORK, (intptr_t)0 }, { "MEDIA_ERR_DECODE", DontDelete|ReadOnly, (intptr_t)jsMediaErrorMEDIA_ERR_DECODE, (intptr_t)0 }, + { "MEDIA_ERR_SRC_NOT_SUPPORTED", DontDelete|ReadOnly, (intptr_t)jsMediaErrorMEDIA_ERR_SRC_NOT_SUPPORTED, (intptr_t)0 }, { 0, 0, 0, 0 } }; static const HashTable JSMediaErrorPrototypeTable = #if ENABLE(PERFECT_HASH_SIZE) - { 3, JSMediaErrorPrototypeTableValues, 0 }; + { 31, JSMediaErrorPrototypeTableValues, 0 }; #else - { 8, 7, JSMediaErrorPrototypeTableValues, 0 }; + { 9, 7, JSMediaErrorPrototypeTableValues, 0 }; #endif const ClassInfo JSMediaErrorPrototype::s_info = { "MediaErrorPrototype", 0, &JSMediaErrorPrototypeTable, 0 }; -JSObject* JSMediaErrorPrototype::self(ExecState* exec) +JSObject* JSMediaErrorPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSMediaError>(exec); + return getDOMPrototype<JSMediaError>(exec, globalObject); } bool JSMediaErrorPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -134,12 +136,11 @@ JSMediaError::JSMediaError(PassRefPtr<Structure> structure, PassRefPtr<MediaErro JSMediaError::~JSMediaError() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSMediaError::createPrototype(ExecState* exec) +JSObject* JSMediaError::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSMediaErrorPrototype(JSMediaErrorPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSMediaErrorPrototype(JSMediaErrorPrototype::createStructure(globalObject->objectPrototype())); } bool JSMediaError::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -147,45 +148,51 @@ bool JSMediaError::getOwnPropertySlot(ExecState* exec, const Identifier& propert return getStaticValueSlot<JSMediaError, Base>(exec, &JSMediaErrorTable, this, propertyName, slot); } -JSValuePtr jsMediaErrorCode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMediaErrorCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MediaError* imp = static_cast<MediaError*>(static_cast<JSMediaError*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->code()); } -JSValuePtr jsMediaErrorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMediaErrorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSMediaError*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSMediaError::getConstructor(ExecState* exec) +JSValue JSMediaError::getConstructor(ExecState* exec) { return getDOMConstructor<JSMediaErrorConstructor>(exec); } // Constant getters -JSValuePtr jsMediaErrorMEDIA_ERR_ABORTED(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsMediaErrorMEDIA_ERR_ABORTED(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsMediaErrorMEDIA_ERR_NETWORK(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsMediaErrorMEDIA_ERR_NETWORK(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsMediaErrorMEDIA_ERR_DECODE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsMediaErrorMEDIA_ERR_DECODE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, MediaError* object) +JSValue jsMediaErrorMEDIA_ERR_SRC_NOT_SUPPORTED(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(4)); +} + +JSC::JSValue toJS(JSC::ExecState* exec, MediaError* object) { return getDOMObjectWrapper<JSMediaError>(exec, object); } -MediaError* toMediaError(JSC::JSValuePtr value) +MediaError* toMediaError(JSC::JSValue value) { - return value->isObject(&JSMediaError::s_info) ? static_cast<JSMediaError*>(asObject(value))->impl() : 0; + return value.isObject(&JSMediaError::s_info) ? static_cast<JSMediaError*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSMediaError.h b/src/3rdparty/webkit/WebCore/generated/JSMediaError.h index f2215586c2..eab4bf705e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMediaError.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMediaError.h @@ -37,33 +37,34 @@ class JSMediaError : public DOMObject { public: JSMediaError(PassRefPtr<JSC::Structure>, PassRefPtr<MediaError>); virtual ~JSMediaError(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); MediaError* impl() const { return m_impl.get(); } private: RefPtr<MediaError> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, MediaError*); -MediaError* toMediaError(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, MediaError*); +MediaError* toMediaError(JSC::JSValue); class JSMediaErrorPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -72,13 +73,14 @@ public: // Attributes -JSC::JSValuePtr jsMediaErrorCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMediaErrorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMediaErrorCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMediaErrorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsMediaErrorMEDIA_ERR_ABORTED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMediaErrorMEDIA_ERR_NETWORK(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMediaErrorMEDIA_ERR_DECODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMediaErrorMEDIA_ERR_ABORTED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMediaErrorMEDIA_ERR_NETWORK(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMediaErrorMEDIA_ERR_DECODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMediaErrorMEDIA_ERR_SRC_NOT_SUPPORTED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSMediaList.cpp b/src/3rdparty/webkit/WebCore/generated/JSMediaList.cpp index ce48c390f2..84effe028a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMediaList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMediaList.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSMediaList) +ASSERT_CLASS_FITS_IN_CELL(JSMediaList); /* Hash table */ @@ -73,13 +73,13 @@ public: JSMediaListConstructor(ExecState* exec) : DOMObject(JSMediaListConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSMediaListPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSMediaListPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -111,9 +111,9 @@ static const HashTable JSMediaListPrototypeTable = const ClassInfo JSMediaListPrototype::s_info = { "MediaListPrototype", 0, &JSMediaListPrototypeTable, 0 }; -JSObject* JSMediaListPrototype::self(ExecState* exec) +JSObject* JSMediaListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSMediaList>(exec); + return getDOMPrototype<JSMediaList>(exec, globalObject); } bool JSMediaListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -132,12 +132,11 @@ JSMediaList::JSMediaList(PassRefPtr<Structure> structure, PassRefPtr<MediaList> JSMediaList::~JSMediaList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSMediaList::createPrototype(ExecState* exec) +JSObject* JSMediaList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSMediaListPrototype(JSMediaListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSMediaListPrototype(JSMediaListPrototype::createStructure(globalObject->objectPrototype())); } bool JSMediaList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -165,28 +164,30 @@ bool JSMediaList::getOwnPropertySlot(ExecState* exec, unsigned propertyName, Pro return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -JSValuePtr jsMediaListMediaText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMediaListMediaText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MediaList* imp = static_cast<MediaList*>(static_cast<JSMediaList*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->mediaText()); } -JSValuePtr jsMediaListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMediaListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MediaList* imp = static_cast<MediaList*>(static_cast<JSMediaList*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsMediaListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMediaListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSMediaList*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSMediaList::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSMediaList::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSMediaList, Base>(exec, propertyName, value, &JSMediaListTable, this, slot); } -void setJSMediaListMediaText(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSMediaListMediaText(ExecState* exec, JSObject* thisObject, JSValue value) { MediaList* imp = static_cast<MediaList*>(static_cast<JSMediaList*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -201,46 +202,49 @@ void JSMediaList::getPropertyNames(ExecState* exec, PropertyNameArray& propertyN Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSMediaList::getConstructor(ExecState* exec) +JSValue JSMediaList::getConstructor(ExecState* exec) { return getDOMConstructor<JSMediaListConstructor>(exec); } -JSValuePtr jsMediaListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsMediaListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSMediaList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSMediaList::s_info)) return throwError(exec, TypeError); JSMediaList* castedThisObj = static_cast<JSMediaList*>(asObject(thisValue)); MediaList* imp = static_cast<MediaList*>(castedThisObj->impl()); - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = jsStringOrNull(exec, imp->item(index)); + JSC::JSValue result = jsStringOrNull(exec, imp->item(index)); return result; } -JSValuePtr jsMediaListPrototypeFunctionDeleteMedium(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsMediaListPrototypeFunctionDeleteMedium(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSMediaList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSMediaList::s_info)) return throwError(exec, TypeError); JSMediaList* castedThisObj = static_cast<JSMediaList*>(asObject(thisValue)); MediaList* imp = static_cast<MediaList*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& oldMedium = args.at(exec, 0)->toString(exec); + const UString& oldMedium = args.at(0).toString(exec); imp->deleteMedium(oldMedium, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsMediaListPrototypeFunctionAppendMedium(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsMediaListPrototypeFunctionAppendMedium(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSMediaList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSMediaList::s_info)) return throwError(exec, TypeError); JSMediaList* castedThisObj = static_cast<JSMediaList*>(asObject(thisValue)); MediaList* imp = static_cast<MediaList*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& newMedium = args.at(exec, 0)->toString(exec); + const UString& newMedium = args.at(0).toString(exec); imp->appendMedium(newMedium, ec); setDOMException(exec, ec); @@ -248,18 +252,18 @@ JSValuePtr jsMediaListPrototypeFunctionAppendMedium(ExecState* exec, JSObject*, } -JSValuePtr JSMediaList::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue JSMediaList::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSMediaList* thisObj = static_cast<JSMediaList*>(asObject(slot.slotBase())); return jsStringOrNull(exec, thisObj->impl()->item(slot.index())); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, MediaList* object) +JSC::JSValue toJS(JSC::ExecState* exec, MediaList* object) { return getDOMObjectWrapper<JSMediaList>(exec, object); } -MediaList* toMediaList(JSC::JSValuePtr value) +MediaList* toMediaList(JSC::JSValue value) { - return value->isObject(&JSMediaList::s_info) ? static_cast<JSMediaList*>(asObject(value))->impl() : 0; + return value.isObject(&JSMediaList::s_info) ? static_cast<JSMediaList*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSMediaList.h b/src/3rdparty/webkit/WebCore/generated/JSMediaList.h index 01ce230888..800d9d4b91 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMediaList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMediaList.h @@ -34,37 +34,38 @@ class JSMediaList : public DOMObject { public: JSMediaList(PassRefPtr<JSC::Structure>, PassRefPtr<MediaList>); virtual ~JSMediaList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); MediaList* impl() const { return m_impl.get(); } private: RefPtr<MediaList> m_impl; - static JSC::JSValuePtr indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValuePtr toJS(JSC::ExecState*, MediaList*); -MediaList* toMediaList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, MediaList*); +MediaList* toMediaList(JSC::JSValue); class JSMediaListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -73,15 +74,15 @@ public: // Functions -JSC::JSValuePtr jsMediaListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsMediaListPrototypeFunctionDeleteMedium(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsMediaListPrototypeFunctionAppendMedium(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsMediaListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsMediaListPrototypeFunctionDeleteMedium(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsMediaListPrototypeFunctionAppendMedium(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsMediaListMediaText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSMediaListMediaText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsMediaListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMediaListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMediaListMediaText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSMediaListMediaText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsMediaListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMediaListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSMessageChannel.cpp b/src/3rdparty/webkit/WebCore/generated/JSMessageChannel.cpp index ac725d4dbd..47dfef6b62 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMessageChannel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMessageChannel.cpp @@ -33,7 +33,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSMessageChannel) +ASSERT_CLASS_FITS_IN_CELL(JSMessageChannel); /* Hash table */ @@ -71,9 +71,9 @@ static const HashTable* getJSMessageChannelPrototypeTable(ExecState* exec) } const ClassInfo JSMessageChannelPrototype::s_info = { "MessageChannelPrototype", 0, 0, getJSMessageChannelPrototypeTable }; -JSObject* JSMessageChannelPrototype::self(ExecState* exec) +JSObject* JSMessageChannelPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSMessageChannel>(exec); + return getDOMPrototype<JSMessageChannel>(exec, globalObject); } static const HashTable* getJSMessageChannelTable(ExecState* exec) @@ -91,12 +91,11 @@ JSMessageChannel::JSMessageChannel(PassRefPtr<Structure> structure, PassRefPtr<M JSMessageChannel::~JSMessageChannel() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSMessageChannel::createPrototype(ExecState* exec) +JSObject* JSMessageChannel::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSMessageChannelPrototype(JSMessageChannelPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSMessageChannelPrototype(JSMessageChannelPrototype::createStructure(globalObject->objectPrototype())); } bool JSMessageChannel::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -104,25 +103,27 @@ bool JSMessageChannel::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSMessageChannel, Base>(exec, getJSMessageChannelTable(exec), this, propertyName, slot); } -JSValuePtr jsMessageChannelPort1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMessageChannelPort1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MessageChannel* imp = static_cast<MessageChannel*>(static_cast<JSMessageChannel*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->port1())); } -JSValuePtr jsMessageChannelPort2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMessageChannelPort2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MessageChannel* imp = static_cast<MessageChannel*>(static_cast<JSMessageChannel*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->port2())); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, MessageChannel* object) +JSC::JSValue toJS(JSC::ExecState* exec, MessageChannel* object) { return getDOMObjectWrapper<JSMessageChannel>(exec, object); } -MessageChannel* toMessageChannel(JSC::JSValuePtr value) +MessageChannel* toMessageChannel(JSC::JSValue value) { - return value->isObject(&JSMessageChannel::s_info) ? static_cast<JSMessageChannel*>(asObject(value))->impl() : 0; + return value.isObject(&JSMessageChannel::s_info) ? static_cast<JSMessageChannel*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSMessageChannel.h b/src/3rdparty/webkit/WebCore/generated/JSMessageChannel.h index f4aa3b5e9d..f9a90261be 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMessageChannel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMessageChannel.h @@ -34,12 +34,12 @@ class JSMessageChannel : public DOMObject { public: JSMessageChannel(PassRefPtr<JSC::Structure>, PassRefPtr<MessageChannel>); virtual ~JSMessageChannel(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -52,12 +52,13 @@ private: RefPtr<MessageChannel> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, MessageChannel*); -MessageChannel* toMessageChannel(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, MessageChannel*); +MessageChannel* toMessageChannel(JSC::JSValue); class JSMessageChannelPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSMessageChannelPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -65,8 +66,8 @@ public: // Attributes -JSC::JSValuePtr jsMessageChannelPort1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMessageChannelPort2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMessageChannelPort1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMessageChannelPort2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSMessageEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSMessageEvent.cpp index f0ee01640d..b49fd94d0b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMessageEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMessageEvent.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSMessageEvent) +ASSERT_CLASS_FITS_IN_CELL(JSMessageEvent); /* Hash table */ @@ -80,13 +80,13 @@ public: JSMessageEventConstructor(ExecState* exec) : DOMObject(JSMessageEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSMessageEventPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSMessageEventPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -120,9 +120,9 @@ static const HashTable* getJSMessageEventPrototypeTable(ExecState* exec) } const ClassInfo JSMessageEventPrototype::s_info = { "MessageEventPrototype", 0, 0, getJSMessageEventPrototypeTable }; -JSObject* JSMessageEventPrototype::self(ExecState* exec) +JSObject* JSMessageEventPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSMessageEvent>(exec); + return getDOMPrototype<JSMessageEvent>(exec, globalObject); } bool JSMessageEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -141,9 +141,9 @@ JSMessageEvent::JSMessageEvent(PassRefPtr<Structure> structure, PassRefPtr<Messa { } -JSObject* JSMessageEvent::createPrototype(ExecState* exec) +JSObject* JSMessageEvent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSMessageEventPrototype(JSMessageEventPrototype::createStructure(JSEventPrototype::self(exec))); + return new (exec) JSMessageEventPrototype(JSMessageEventPrototype::createStructure(JSEventPrototype::self(exec, globalObject))); } bool JSMessageEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -151,59 +151,65 @@ bool JSMessageEvent::getOwnPropertySlot(ExecState* exec, const Identifier& prope return getStaticValueSlot<JSMessageEvent, Base>(exec, getJSMessageEventTable(exec), this, propertyName, slot); } -JSValuePtr jsMessageEventData(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMessageEventData(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MessageEvent* imp = static_cast<MessageEvent*>(static_cast<JSMessageEvent*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->data()); } -JSValuePtr jsMessageEventOrigin(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMessageEventOrigin(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MessageEvent* imp = static_cast<MessageEvent*>(static_cast<JSMessageEvent*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->origin()); } -JSValuePtr jsMessageEventLastEventId(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMessageEventLastEventId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MessageEvent* imp = static_cast<MessageEvent*>(static_cast<JSMessageEvent*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->lastEventId()); } -JSValuePtr jsMessageEventSource(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMessageEventSource(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MessageEvent* imp = static_cast<MessageEvent*>(static_cast<JSMessageEvent*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->source())); } -JSValuePtr jsMessageEventMessagePort(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMessageEventMessagePort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MessageEvent* imp = static_cast<MessageEvent*>(static_cast<JSMessageEvent*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->messagePort())); } -JSValuePtr jsMessageEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMessageEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSMessageEvent*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSMessageEvent::getConstructor(ExecState* exec) +JSValue JSMessageEvent::getConstructor(ExecState* exec) { return getDOMConstructor<JSMessageEventConstructor>(exec); } -JSValuePtr jsMessageEventPrototypeFunctionInitMessageEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsMessageEventPrototypeFunctionInitMessageEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSMessageEvent::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSMessageEvent::s_info)) return throwError(exec, TypeError); JSMessageEvent* castedThisObj = static_cast<JSMessageEvent*>(asObject(thisValue)); MessageEvent* imp = static_cast<MessageEvent*>(castedThisObj->impl()); - const UString& typeArg = args.at(exec, 0)->toString(exec); - bool canBubbleArg = args.at(exec, 1)->toBoolean(exec); - bool cancelableArg = args.at(exec, 2)->toBoolean(exec); - const UString& dataArg = args.at(exec, 3)->toString(exec); - const UString& originArg = args.at(exec, 4)->toString(exec); - const UString& lastEventIdArg = args.at(exec, 5)->toString(exec); - DOMWindow* sourceArg = toDOMWindow(args.at(exec, 6)); - MessagePort* messagePort = toMessagePort(args.at(exec, 7)); + const UString& typeArg = args.at(0).toString(exec); + bool canBubbleArg = args.at(1).toBoolean(exec); + bool cancelableArg = args.at(2).toBoolean(exec); + const UString& dataArg = args.at(3).toString(exec); + const UString& originArg = args.at(4).toString(exec); + const UString& lastEventIdArg = args.at(5).toString(exec); + DOMWindow* sourceArg = toDOMWindow(args.at(6)); + MessagePort* messagePort = toMessagePort(args.at(7)); imp->initMessageEvent(typeArg, canBubbleArg, cancelableArg, dataArg, originArg, lastEventIdArg, sourceArg, messagePort); return jsUndefined(); diff --git a/src/3rdparty/webkit/WebCore/generated/JSMessageEvent.h b/src/3rdparty/webkit/WebCore/generated/JSMessageEvent.h index 501af7d71b..4cdefab8f2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMessageEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMessageEvent.h @@ -31,27 +31,28 @@ class JSMessageEvent : public JSEvent { typedef JSEvent Base; public: JSMessageEvent(PassRefPtr<JSC::Structure>, PassRefPtr<MessageEvent>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSMessageEventPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,15 +61,15 @@ public: // Functions -JSC::JSValuePtr jsMessageEventPrototypeFunctionInitMessageEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsMessageEventPrototypeFunctionInitMessageEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsMessageEventData(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMessageEventOrigin(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMessageEventLastEventId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMessageEventSource(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMessageEventMessagePort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMessageEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMessageEventData(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMessageEventOrigin(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMessageEventLastEventId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMessageEventSource(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMessageEventMessagePort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMessageEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSMessagePort.cpp b/src/3rdparty/webkit/WebCore/generated/JSMessagePort.cpp index fe6c57f6fc..5f9eb5ed97 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMessagePort.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMessagePort.cpp @@ -41,7 +41,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSMessagePort) +ASSERT_CLASS_FITS_IN_CELL(JSMessagePort); /* Hash table */ @@ -80,13 +80,13 @@ public: JSMessagePortConstructor(ExecState* exec) : DOMObject(JSMessagePortConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSMessagePortPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSMessagePortPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -126,9 +126,9 @@ static const HashTable* getJSMessagePortPrototypeTable(ExecState* exec) } const ClassInfo JSMessagePortPrototype::s_info = { "MessagePortPrototype", 0, 0, getJSMessagePortPrototypeTable }; -JSObject* JSMessagePortPrototype::self(ExecState* exec) +JSObject* JSMessagePortPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSMessagePort>(exec); + return getDOMPrototype<JSMessagePort>(exec, globalObject); } bool JSMessagePortPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -151,12 +151,11 @@ JSMessagePort::JSMessagePort(PassRefPtr<Structure> structure, PassRefPtr<Message JSMessagePort::~JSMessagePort() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSMessagePort::createPrototype(ExecState* exec) +JSObject* JSMessagePort::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSMessagePortPrototype(JSMessagePortPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSMessagePortPrototype(JSMessagePortPrototype::createStructure(globalObject->objectPrototype())); } bool JSMessagePort::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -164,72 +163,78 @@ bool JSMessagePort::getOwnPropertySlot(ExecState* exec, const Identifier& proper return getStaticValueSlot<JSMessagePort, Base>(exec, getJSMessagePortTable(exec), this, propertyName, slot); } -JSValuePtr jsMessagePortActive(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMessagePortActive(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MessagePort* imp = static_cast<MessagePort*>(static_cast<JSMessagePort*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->active()); } -JSValuePtr jsMessagePortOnmessage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMessagePortOnmessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MessagePort* imp = static_cast<MessagePort*>(static_cast<JSMessagePort*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onmessage())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onmessage()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsMessagePortOnclose(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMessagePortOnclose(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MessagePort* imp = static_cast<MessagePort*>(static_cast<JSMessagePort*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onclose())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onclose()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsMessagePortConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMessagePortConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSMessagePort*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSMessagePort::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSMessagePort::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSMessagePort, Base>(exec, propertyName, value, getJSMessagePortTable(exec), this, slot); } -void setJSMessagePortOnmessage(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSMessagePortOnmessage(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); MessagePort* imp = static_cast<MessagePort*>(static_cast<JSMessagePort*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnmessage(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnmessage(globalObject->createJSAttributeEventListener(value)); } -void setJSMessagePortOnclose(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSMessagePortOnclose(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); MessagePort* imp = static_cast<MessagePort*>(static_cast<JSMessagePort*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnclose(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnclose(globalObject->createJSAttributeEventListener(value)); } -JSValuePtr JSMessagePort::getConstructor(ExecState* exec) +JSValue JSMessagePort::getConstructor(ExecState* exec) { return getDOMConstructor<JSMessagePortConstructor>(exec); } -JSValuePtr jsMessagePortPrototypeFunctionPostMessage(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsMessagePortPrototypeFunctionPostMessage(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSMessagePort::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSMessagePort::s_info)) return throwError(exec, TypeError); JSMessagePort* castedThisObj = static_cast<JSMessagePort*>(asObject(thisValue)); MessagePort* imp = static_cast<MessagePort*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& message = args.at(exec, 0)->toString(exec); + const UString& message = args.at(0).toString(exec); int argsCount = args.size(); if (argsCount < 2) { @@ -238,24 +243,26 @@ JSValuePtr jsMessagePortPrototypeFunctionPostMessage(ExecState* exec, JSObject*, return jsUndefined(); } - MessagePort* messagePort = toMessagePort(args.at(exec, 1)); + MessagePort* messagePort = toMessagePort(args.at(1)); imp->postMessage(message, messagePort, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsMessagePortPrototypeFunctionStartConversation(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsMessagePortPrototypeFunctionStartConversation(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSMessagePort::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSMessagePort::s_info)) return throwError(exec, TypeError); JSMessagePort* castedThisObj = static_cast<JSMessagePort*>(asObject(thisValue)); return castedThisObj->startConversation(exec, args); } -JSValuePtr jsMessagePortPrototypeFunctionStart(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsMessagePortPrototypeFunctionStart(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSMessagePort::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSMessagePort::s_info)) return throwError(exec, TypeError); JSMessagePort* castedThisObj = static_cast<JSMessagePort*>(asObject(thisValue)); MessagePort* imp = static_cast<MessagePort*>(castedThisObj->impl()); @@ -264,9 +271,10 @@ JSValuePtr jsMessagePortPrototypeFunctionStart(ExecState* exec, JSObject*, JSVal return jsUndefined(); } -JSValuePtr jsMessagePortPrototypeFunctionClose(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsMessagePortPrototypeFunctionClose(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSMessagePort::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSMessagePort::s_info)) return throwError(exec, TypeError); JSMessagePort* castedThisObj = static_cast<JSMessagePort*>(asObject(thisValue)); MessagePort* imp = static_cast<MessagePort*>(castedThisObj->impl()); @@ -275,44 +283,47 @@ JSValuePtr jsMessagePortPrototypeFunctionClose(ExecState* exec, JSObject*, JSVal return jsUndefined(); } -JSValuePtr jsMessagePortPrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsMessagePortPrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSMessagePort::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSMessagePort::s_info)) return throwError(exec, TypeError); JSMessagePort* castedThisObj = static_cast<JSMessagePort*>(asObject(thisValue)); return castedThisObj->addEventListener(exec, args); } -JSValuePtr jsMessagePortPrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsMessagePortPrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSMessagePort::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSMessagePort::s_info)) return throwError(exec, TypeError); JSMessagePort* castedThisObj = static_cast<JSMessagePort*>(asObject(thisValue)); return castedThisObj->removeEventListener(exec, args); } -JSValuePtr jsMessagePortPrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsMessagePortPrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSMessagePort::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSMessagePort::s_info)) return throwError(exec, TypeError); JSMessagePort* castedThisObj = static_cast<JSMessagePort*>(asObject(thisValue)); MessagePort* imp = static_cast<MessagePort*>(castedThisObj->impl()); ExceptionCode ec = 0; - Event* evt = toEvent(args.at(exec, 0)); + Event* evt = toEvent(args.at(0)); - JSC::JSValuePtr result = jsBoolean(imp->dispatchEvent(evt, ec)); + JSC::JSValue result = jsBoolean(imp->dispatchEvent(evt, ec)); setDOMException(exec, ec); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, MessagePort* object) +JSC::JSValue toJS(JSC::ExecState* exec, MessagePort* object) { return getDOMObjectWrapper<JSMessagePort>(exec, object); } -MessagePort* toMessagePort(JSC::JSValuePtr value) +MessagePort* toMessagePort(JSC::JSValue value) { - return value->isObject(&JSMessagePort::s_info) ? static_cast<JSMessagePort*>(asObject(value))->impl() : 0; + return value.isObject(&JSMessagePort::s_info) ? static_cast<JSMessagePort*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSMessagePort.h b/src/3rdparty/webkit/WebCore/generated/JSMessagePort.h index 46e1591125..615d649bdd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMessagePort.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMessagePort.h @@ -34,41 +34,42 @@ class JSMessagePort : public DOMObject { public: JSMessagePort(PassRefPtr<JSC::Structure>, PassRefPtr<MessagePort>); virtual ~JSMessagePort(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void mark(); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom functions - JSC::JSValuePtr startConversation(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr addEventListener(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr removeEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue startConversation(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue addEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue removeEventListener(JSC::ExecState*, const JSC::ArgList&); MessagePort* impl() const { return m_impl.get(); } private: RefPtr<MessagePort> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, MessagePort*); -MessagePort* toMessagePort(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, MessagePort*); +MessagePort* toMessagePort(JSC::JSValue); class JSMessagePortPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -77,21 +78,21 @@ public: // Functions -JSC::JSValuePtr jsMessagePortPrototypeFunctionPostMessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsMessagePortPrototypeFunctionStartConversation(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsMessagePortPrototypeFunctionStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsMessagePortPrototypeFunctionClose(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsMessagePortPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsMessagePortPrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsMessagePortPrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsMessagePortPrototypeFunctionPostMessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsMessagePortPrototypeFunctionStartConversation(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsMessagePortPrototypeFunctionStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsMessagePortPrototypeFunctionClose(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsMessagePortPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsMessagePortPrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsMessagePortPrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsMessagePortActive(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMessagePortOnmessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSMessagePortOnmessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsMessagePortOnclose(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSMessagePortOnclose(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsMessagePortConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMessagePortActive(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMessagePortOnmessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSMessagePortOnmessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsMessagePortOnclose(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSMessagePortOnclose(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsMessagePortConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSMimeType.cpp b/src/3rdparty/webkit/WebCore/generated/JSMimeType.cpp index 0d831176fd..292543db59 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMimeType.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMimeType.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSMimeType) +ASSERT_CLASS_FITS_IN_CELL(JSMimeType); /* Hash table */ @@ -76,13 +76,13 @@ public: JSMimeTypeConstructor(ExecState* exec) : DOMObject(JSMimeTypeConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSMimeTypePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSMimeTypePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -111,9 +111,9 @@ static const HashTable JSMimeTypePrototypeTable = const ClassInfo JSMimeTypePrototype::s_info = { "MimeTypePrototype", 0, &JSMimeTypePrototypeTable, 0 }; -JSObject* JSMimeTypePrototype::self(ExecState* exec) +JSObject* JSMimeTypePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSMimeType>(exec); + return getDOMPrototype<JSMimeType>(exec, globalObject); } const ClassInfo JSMimeType::s_info = { "MimeType", 0, &JSMimeTypeTable, 0 }; @@ -127,12 +127,11 @@ JSMimeType::JSMimeType(PassRefPtr<Structure> structure, PassRefPtr<MimeType> imp JSMimeType::~JSMimeType() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSMimeType::createPrototype(ExecState* exec) +JSObject* JSMimeType::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSMimeTypePrototype(JSMimeTypePrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSMimeTypePrototype(JSMimeTypePrototype::createStructure(globalObject->objectPrototype())); } bool JSMimeType::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -140,46 +139,50 @@ bool JSMimeType::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN return getStaticValueSlot<JSMimeType, Base>(exec, &JSMimeTypeTable, this, propertyName, slot); } -JSValuePtr jsMimeTypeType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMimeTypeType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MimeType* imp = static_cast<MimeType*>(static_cast<JSMimeType*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsMimeTypeSuffixes(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMimeTypeSuffixes(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MimeType* imp = static_cast<MimeType*>(static_cast<JSMimeType*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->suffixes()); } -JSValuePtr jsMimeTypeDescription(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMimeTypeDescription(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MimeType* imp = static_cast<MimeType*>(static_cast<JSMimeType*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->description()); } -JSValuePtr jsMimeTypeEnabledPlugin(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMimeTypeEnabledPlugin(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MimeType* imp = static_cast<MimeType*>(static_cast<JSMimeType*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->enabledPlugin())); } -JSValuePtr jsMimeTypeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMimeTypeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSMimeType*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSMimeType::getConstructor(ExecState* exec) +JSValue JSMimeType::getConstructor(ExecState* exec) { return getDOMConstructor<JSMimeTypeConstructor>(exec); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, MimeType* object) +JSC::JSValue toJS(JSC::ExecState* exec, MimeType* object) { return getDOMObjectWrapper<JSMimeType>(exec, object); } -MimeType* toMimeType(JSC::JSValuePtr value) +MimeType* toMimeType(JSC::JSValue value) { - return value->isObject(&JSMimeType::s_info) ? static_cast<JSMimeType*>(asObject(value))->impl() : 0; + return value.isObject(&JSMimeType::s_info) ? static_cast<JSMimeType*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSMimeType.h b/src/3rdparty/webkit/WebCore/generated/JSMimeType.h index 6de6aa235f..79b904d42e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMimeType.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMimeType.h @@ -34,29 +34,30 @@ class JSMimeType : public DOMObject { public: JSMimeType(PassRefPtr<JSC::Structure>, PassRefPtr<MimeType>); virtual ~JSMimeType(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); MimeType* impl() const { return m_impl.get(); } private: RefPtr<MimeType> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, MimeType*); -MimeType* toMimeType(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, MimeType*); +MimeType* toMimeType(JSC::JSValue); class JSMimeTypePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSMimeTypePrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -64,11 +65,11 @@ public: // Attributes -JSC::JSValuePtr jsMimeTypeType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMimeTypeSuffixes(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMimeTypeDescription(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMimeTypeEnabledPlugin(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMimeTypeConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMimeTypeType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMimeTypeSuffixes(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMimeTypeDescription(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMimeTypeEnabledPlugin(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMimeTypeConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSMimeTypeArray.cpp b/src/3rdparty/webkit/WebCore/generated/JSMimeTypeArray.cpp index 688f7f2644..1a5fdc819b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMimeTypeArray.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMimeTypeArray.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSMimeTypeArray) +ASSERT_CLASS_FITS_IN_CELL(JSMimeTypeArray); /* Hash table */ @@ -74,13 +74,13 @@ public: JSMimeTypeArrayConstructor(ExecState* exec) : DOMObject(JSMimeTypeArrayConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSMimeTypeArrayPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSMimeTypeArrayPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -111,9 +111,9 @@ static const HashTable JSMimeTypeArrayPrototypeTable = const ClassInfo JSMimeTypeArrayPrototype::s_info = { "MimeTypeArrayPrototype", 0, &JSMimeTypeArrayPrototypeTable, 0 }; -JSObject* JSMimeTypeArrayPrototype::self(ExecState* exec) +JSObject* JSMimeTypeArrayPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSMimeTypeArray>(exec); + return getDOMPrototype<JSMimeTypeArray>(exec, globalObject); } bool JSMimeTypeArrayPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -132,12 +132,11 @@ JSMimeTypeArray::JSMimeTypeArray(PassRefPtr<Structure> structure, PassRefPtr<Mim JSMimeTypeArray::~JSMimeTypeArray() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSMimeTypeArray::createPrototype(ExecState* exec) +JSObject* JSMimeTypeArray::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSMimeTypeArrayPrototype(JSMimeTypeArrayPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSMimeTypeArrayPrototype(JSMimeTypeArrayPrototype::createStructure(globalObject->objectPrototype())); } bool JSMimeTypeArray::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -169,13 +168,14 @@ bool JSMimeTypeArray::getOwnPropertySlot(ExecState* exec, unsigned propertyName, return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -JSValuePtr jsMimeTypeArrayLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMimeTypeArrayLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MimeTypeArray* imp = static_cast<MimeTypeArray*>(static_cast<JSMimeTypeArray*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsMimeTypeArrayConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMimeTypeArrayConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSMimeTypeArray*>(asObject(slot.slotBase()))->getConstructor(exec); } @@ -186,50 +186,52 @@ void JSMimeTypeArray::getPropertyNames(ExecState* exec, PropertyNameArray& prope Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSMimeTypeArray::getConstructor(ExecState* exec) +JSValue JSMimeTypeArray::getConstructor(ExecState* exec) { return getDOMConstructor<JSMimeTypeArrayConstructor>(exec); } -JSValuePtr jsMimeTypeArrayPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsMimeTypeArrayPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSMimeTypeArray::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSMimeTypeArray::s_info)) return throwError(exec, TypeError); JSMimeTypeArray* castedThisObj = static_cast<JSMimeTypeArray*>(asObject(thisValue)); MimeTypeArray* imp = static_cast<MimeTypeArray*>(castedThisObj->impl()); - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); return result; } -JSValuePtr jsMimeTypeArrayPrototypeFunctionNamedItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsMimeTypeArrayPrototypeFunctionNamedItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSMimeTypeArray::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSMimeTypeArray::s_info)) return throwError(exec, TypeError); JSMimeTypeArray* castedThisObj = static_cast<JSMimeTypeArray*>(asObject(thisValue)); MimeTypeArray* imp = static_cast<MimeTypeArray*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->namedItem(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->namedItem(name))); return result; } -JSValuePtr JSMimeTypeArray::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue JSMimeTypeArray::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSMimeTypeArray* thisObj = static_cast<JSMimeTypeArray*>(asObject(slot.slotBase())); return toJS(exec, static_cast<MimeTypeArray*>(thisObj->impl())->item(slot.index())); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, MimeTypeArray* object) +JSC::JSValue toJS(JSC::ExecState* exec, MimeTypeArray* object) { return getDOMObjectWrapper<JSMimeTypeArray>(exec, object); } -MimeTypeArray* toMimeTypeArray(JSC::JSValuePtr value) +MimeTypeArray* toMimeTypeArray(JSC::JSValue value) { - return value->isObject(&JSMimeTypeArray::s_info) ? static_cast<JSMimeTypeArray*>(asObject(value))->impl() : 0; + return value.isObject(&JSMimeTypeArray::s_info) ? static_cast<JSMimeTypeArray*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSMimeTypeArray.h b/src/3rdparty/webkit/WebCore/generated/JSMimeTypeArray.h index b261caf115..adc48244ff 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMimeTypeArray.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMimeTypeArray.h @@ -34,39 +34,40 @@ class JSMimeTypeArray : public DOMObject { public: JSMimeTypeArray(PassRefPtr<JSC::Structure>, PassRefPtr<MimeTypeArray>); virtual ~JSMimeTypeArray(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); MimeTypeArray* impl() const { return m_impl.get(); } private: RefPtr<MimeTypeArray> m_impl; - static JSC::JSValuePtr indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); private: static bool canGetItemsForName(JSC::ExecState*, MimeTypeArray*, const JSC::Identifier&); - static JSC::JSValuePtr nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValuePtr toJS(JSC::ExecState*, MimeTypeArray*); -MimeTypeArray* toMimeTypeArray(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, MimeTypeArray*); +MimeTypeArray* toMimeTypeArray(JSC::JSValue); class JSMimeTypeArrayPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -75,12 +76,12 @@ public: // Functions -JSC::JSValuePtr jsMimeTypeArrayPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsMimeTypeArrayPrototypeFunctionNamedItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsMimeTypeArrayPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsMimeTypeArrayPrototypeFunctionNamedItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsMimeTypeArrayLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMimeTypeArrayConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMimeTypeArrayLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMimeTypeArrayConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSMouseEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSMouseEvent.cpp index dd39497379..95001ac521 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMouseEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMouseEvent.cpp @@ -29,7 +29,6 @@ #include "JSClipboard.h" #include "JSDOMWindow.h" #include "JSEventTarget.h" -#include "JSEventTargetNode.h" #include "JSNode.h" #include "MouseEvent.h" #include "Node.h" @@ -41,7 +40,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSMouseEvent) +ASSERT_CLASS_FITS_IN_CELL(JSMouseEvent); /* Hash table */ @@ -94,13 +93,13 @@ public: JSMouseEventConstructor(ExecState* exec) : DOMObject(JSMouseEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSMouseEventPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSMouseEventPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -130,9 +129,9 @@ static const HashTable JSMouseEventPrototypeTable = const ClassInfo JSMouseEventPrototype::s_info = { "MouseEventPrototype", 0, &JSMouseEventPrototypeTable, 0 }; -JSObject* JSMouseEventPrototype::self(ExecState* exec) +JSObject* JSMouseEventPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSMouseEvent>(exec); + return getDOMPrototype<JSMouseEvent>(exec, globalObject); } bool JSMouseEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -147,9 +146,9 @@ JSMouseEvent::JSMouseEvent(PassRefPtr<Structure> structure, PassRefPtr<MouseEven { } -JSObject* JSMouseEvent::createPrototype(ExecState* exec) +JSObject* JSMouseEvent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSMouseEventPrototype(JSMouseEventPrototype::createStructure(JSUIEventPrototype::self(exec))); + return new (exec) JSMouseEventPrototype(JSMouseEventPrototype::createStructure(JSUIEventPrototype::self(exec, globalObject))); } bool JSMouseEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -157,138 +156,156 @@ bool JSMouseEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propert return getStaticValueSlot<JSMouseEvent, Base>(exec, &JSMouseEventTable, this, propertyName, slot); } -JSValuePtr jsMouseEventScreenX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventScreenX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->screenX()); } -JSValuePtr jsMouseEventScreenY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventScreenY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->screenY()); } -JSValuePtr jsMouseEventClientX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventClientX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->clientX()); } -JSValuePtr jsMouseEventClientY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventClientY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->clientY()); } -JSValuePtr jsMouseEventCtrlKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventCtrlKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->ctrlKey()); } -JSValuePtr jsMouseEventShiftKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventShiftKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->shiftKey()); } -JSValuePtr jsMouseEventAltKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventAltKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->altKey()); } -JSValuePtr jsMouseEventMetaKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventMetaKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->metaKey()); } -JSValuePtr jsMouseEventButton(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventButton(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->button()); } -JSValuePtr jsMouseEventRelatedTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventRelatedTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->relatedTarget())); } -JSValuePtr jsMouseEventOffsetX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventOffsetX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->offsetX()); } -JSValuePtr jsMouseEventOffsetY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventOffsetY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->offsetY()); } -JSValuePtr jsMouseEventX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsMouseEventY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -JSValuePtr jsMouseEventFromElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventFromElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->fromElement())); } -JSValuePtr jsMouseEventToElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventToElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->toElement())); } -JSValuePtr jsMouseEventDataTransfer(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventDataTransfer(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MouseEvent* imp = static_cast<MouseEvent*>(static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->dataTransfer())); } -JSValuePtr jsMouseEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMouseEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSMouseEvent*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSMouseEvent::getConstructor(ExecState* exec) +JSValue JSMouseEvent::getConstructor(ExecState* exec) { return getDOMConstructor<JSMouseEventConstructor>(exec); } -JSValuePtr jsMouseEventPrototypeFunctionInitMouseEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsMouseEventPrototypeFunctionInitMouseEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSMouseEvent::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSMouseEvent::s_info)) return throwError(exec, TypeError); JSMouseEvent* castedThisObj = static_cast<JSMouseEvent*>(asObject(thisValue)); MouseEvent* imp = static_cast<MouseEvent*>(castedThisObj->impl()); - const UString& type = args.at(exec, 0)->toString(exec); - bool canBubble = args.at(exec, 1)->toBoolean(exec); - bool cancelable = args.at(exec, 2)->toBoolean(exec); - DOMWindow* view = toDOMWindow(args.at(exec, 3)); - int detail = args.at(exec, 4)->toInt32(exec); - int screenX = args.at(exec, 5)->toInt32(exec); - int screenY = args.at(exec, 6)->toInt32(exec); - int clientX = args.at(exec, 7)->toInt32(exec); - int clientY = args.at(exec, 8)->toInt32(exec); - bool ctrlKey = args.at(exec, 9)->toBoolean(exec); - bool altKey = args.at(exec, 10)->toBoolean(exec); - bool shiftKey = args.at(exec, 11)->toBoolean(exec); - bool metaKey = args.at(exec, 12)->toBoolean(exec); - unsigned short button = args.at(exec, 13)->toInt32(exec); - EventTargetNode* relatedTarget = toEventTargetNode(args.at(exec, 14)); + const UString& type = args.at(0).toString(exec); + bool canBubble = args.at(1).toBoolean(exec); + bool cancelable = args.at(2).toBoolean(exec); + DOMWindow* view = toDOMWindow(args.at(3)); + int detail = args.at(4).toInt32(exec); + int screenX = args.at(5).toInt32(exec); + int screenY = args.at(6).toInt32(exec); + int clientX = args.at(7).toInt32(exec); + int clientY = args.at(8).toInt32(exec); + bool ctrlKey = args.at(9).toBoolean(exec); + bool altKey = args.at(10).toBoolean(exec); + bool shiftKey = args.at(11).toBoolean(exec); + bool metaKey = args.at(12).toBoolean(exec); + unsigned short button = args.at(13).toInt32(exec); + EventTarget* relatedTarget = toEventTarget(args.at(14)); imp->initMouseEvent(type, canBubble, cancelable, view, detail, screenX, screenY, clientX, clientY, ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget); return jsUndefined(); diff --git a/src/3rdparty/webkit/WebCore/generated/JSMouseEvent.h b/src/3rdparty/webkit/WebCore/generated/JSMouseEvent.h index 4109680edc..3730d934c1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMouseEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMouseEvent.h @@ -31,27 +31,28 @@ class JSMouseEvent : public JSUIEvent { typedef JSUIEvent Base; public: JSMouseEvent(PassRefPtr<JSC::Structure>, PassRefPtr<MouseEvent>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSMouseEventPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,27 +61,27 @@ public: // Functions -JSC::JSValuePtr jsMouseEventPrototypeFunctionInitMouseEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsMouseEventPrototypeFunctionInitMouseEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsMouseEventScreenX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventScreenY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventClientX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventClientY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventCtrlKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventShiftKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventAltKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventMetaKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventButton(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventRelatedTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventOffsetX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventOffsetY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventFromElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventToElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventDataTransfer(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMouseEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventScreenX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventScreenY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventClientX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventClientY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventCtrlKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventShiftKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventAltKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventMetaKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventButton(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventRelatedTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventOffsetX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventOffsetY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventFromElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventToElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventDataTransfer(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMouseEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSMutationEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSMutationEvent.cpp index 6e38809c95..5195e7537e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMutationEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMutationEvent.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSMutationEvent) +ASSERT_CLASS_FITS_IN_CELL(JSMutationEvent); /* Hash table */ @@ -81,13 +81,13 @@ public: JSMutationEventConstructor(ExecState* exec) : DOMObject(JSMutationEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSMutationEventPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSMutationEventPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -120,9 +120,9 @@ static const HashTable JSMutationEventPrototypeTable = const ClassInfo JSMutationEventPrototype::s_info = { "MutationEventPrototype", 0, &JSMutationEventPrototypeTable, 0 }; -JSObject* JSMutationEventPrototype::self(ExecState* exec) +JSObject* JSMutationEventPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSMutationEvent>(exec); + return getDOMPrototype<JSMutationEvent>(exec, globalObject); } bool JSMutationEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -137,9 +137,9 @@ JSMutationEvent::JSMutationEvent(PassRefPtr<Structure> structure, PassRefPtr<Mut { } -JSObject* JSMutationEvent::createPrototype(ExecState* exec) +JSObject* JSMutationEvent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSMutationEventPrototype(JSMutationEventPrototype::createStructure(JSEventPrototype::self(exec))); + return new (exec) JSMutationEventPrototype(JSMutationEventPrototype::createStructure(JSEventPrototype::self(exec, globalObject))); } bool JSMutationEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -147,59 +147,65 @@ bool JSMutationEvent::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSMutationEvent, Base>(exec, &JSMutationEventTable, this, propertyName, slot); } -JSValuePtr jsMutationEventRelatedNode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMutationEventRelatedNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MutationEvent* imp = static_cast<MutationEvent*>(static_cast<JSMutationEvent*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->relatedNode())); } -JSValuePtr jsMutationEventPrevValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMutationEventPrevValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MutationEvent* imp = static_cast<MutationEvent*>(static_cast<JSMutationEvent*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->prevValue()); } -JSValuePtr jsMutationEventNewValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMutationEventNewValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MutationEvent* imp = static_cast<MutationEvent*>(static_cast<JSMutationEvent*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->newValue()); } -JSValuePtr jsMutationEventAttrName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMutationEventAttrName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MutationEvent* imp = static_cast<MutationEvent*>(static_cast<JSMutationEvent*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->attrName()); } -JSValuePtr jsMutationEventAttrChange(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMutationEventAttrChange(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); MutationEvent* imp = static_cast<MutationEvent*>(static_cast<JSMutationEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->attrChange()); } -JSValuePtr jsMutationEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsMutationEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSMutationEvent*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSMutationEvent::getConstructor(ExecState* exec) +JSValue JSMutationEvent::getConstructor(ExecState* exec) { return getDOMConstructor<JSMutationEventConstructor>(exec); } -JSValuePtr jsMutationEventPrototypeFunctionInitMutationEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsMutationEventPrototypeFunctionInitMutationEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSMutationEvent::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSMutationEvent::s_info)) return throwError(exec, TypeError); JSMutationEvent* castedThisObj = static_cast<JSMutationEvent*>(asObject(thisValue)); MutationEvent* imp = static_cast<MutationEvent*>(castedThisObj->impl()); - const UString& type = args.at(exec, 0)->toString(exec); - bool canBubble = args.at(exec, 1)->toBoolean(exec); - bool cancelable = args.at(exec, 2)->toBoolean(exec); - Node* relatedNode = toNode(args.at(exec, 3)); - const UString& prevValue = args.at(exec, 4)->toString(exec); - const UString& newValue = args.at(exec, 5)->toString(exec); - const UString& attrName = args.at(exec, 6)->toString(exec); - unsigned short attrChange = args.at(exec, 7)->toInt32(exec); + const UString& type = args.at(0).toString(exec); + bool canBubble = args.at(1).toBoolean(exec); + bool cancelable = args.at(2).toBoolean(exec); + Node* relatedNode = toNode(args.at(3)); + const UString& prevValue = args.at(4).toString(exec); + const UString& newValue = args.at(5).toString(exec); + const UString& attrName = args.at(6).toString(exec); + unsigned short attrChange = args.at(7).toInt32(exec); imp->initMutationEvent(type, canBubble, cancelable, relatedNode, prevValue, newValue, attrName, attrChange); return jsUndefined(); @@ -207,17 +213,17 @@ JSValuePtr jsMutationEventPrototypeFunctionInitMutationEvent(ExecState* exec, JS // Constant getters -JSValuePtr jsMutationEventMODIFICATION(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsMutationEventMODIFICATION(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsMutationEventADDITION(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsMutationEventADDITION(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsMutationEventREMOVAL(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsMutationEventREMOVAL(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSMutationEvent.h b/src/3rdparty/webkit/WebCore/generated/JSMutationEvent.h index 15b91110a6..7948398738 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMutationEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMutationEvent.h @@ -31,27 +31,28 @@ class JSMutationEvent : public JSEvent { typedef JSEvent Base; public: JSMutationEvent(PassRefPtr<JSC::Structure>, PassRefPtr<MutationEvent>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSMutationEventPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,20 +61,20 @@ public: // Functions -JSC::JSValuePtr jsMutationEventPrototypeFunctionInitMutationEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsMutationEventPrototypeFunctionInitMutationEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsMutationEventRelatedNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMutationEventPrevValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMutationEventNewValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMutationEventAttrName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMutationEventAttrChange(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMutationEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMutationEventRelatedNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMutationEventPrevValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMutationEventNewValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMutationEventAttrName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMutationEventAttrChange(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMutationEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsMutationEventMODIFICATION(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMutationEventADDITION(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsMutationEventREMOVAL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMutationEventMODIFICATION(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMutationEventADDITION(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsMutationEventREMOVAL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSNamedNodeMap.cpp b/src/3rdparty/webkit/WebCore/generated/JSNamedNodeMap.cpp index 8711522be0..c89ba55605 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNamedNodeMap.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSNamedNodeMap.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSNamedNodeMap) +ASSERT_CLASS_FITS_IN_CELL(JSNamedNodeMap); /* Hash table */ @@ -74,13 +74,13 @@ public: JSNamedNodeMapConstructor(ExecState* exec) : DOMObject(JSNamedNodeMapConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSNamedNodeMapPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSNamedNodeMapPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -116,9 +116,9 @@ static const HashTable JSNamedNodeMapPrototypeTable = const ClassInfo JSNamedNodeMapPrototype::s_info = { "NamedNodeMapPrototype", 0, &JSNamedNodeMapPrototypeTable, 0 }; -JSObject* JSNamedNodeMapPrototype::self(ExecState* exec) +JSObject* JSNamedNodeMapPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSNamedNodeMap>(exec); + return getDOMPrototype<JSNamedNodeMap>(exec, globalObject); } bool JSNamedNodeMapPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -137,18 +137,17 @@ JSNamedNodeMap::JSNamedNodeMap(PassRefPtr<Structure> structure, PassRefPtr<Named JSNamedNodeMap::~JSNamedNodeMap() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSNamedNodeMap::createPrototype(ExecState* exec) +JSObject* JSNamedNodeMap::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSNamedNodeMapPrototype(JSNamedNodeMapPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSNamedNodeMapPrototype(JSNamedNodeMapPrototype::createStructure(globalObject->objectPrototype())); } bool JSNamedNodeMap::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { - JSValuePtr proto = prototype(); - if (proto->isObject() && static_cast<JSObject*>(asObject(proto))->hasProperty(exec, propertyName)) + JSValue proto = prototype(); + if (proto.isObject() && static_cast<JSObject*>(asObject(proto))->hasProperty(exec, propertyName)) return false; const HashEntry* entry = JSNamedNodeMapTable.entry(exec, propertyName); @@ -178,13 +177,14 @@ bool JSNamedNodeMap::getOwnPropertySlot(ExecState* exec, unsigned propertyName, return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -JSValuePtr jsNamedNodeMapLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNamedNodeMapLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); NamedNodeMap* imp = static_cast<NamedNodeMap*>(static_cast<JSNamedNodeMap*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsNamedNodeMapConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNamedNodeMapConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSNamedNodeMap*>(asObject(slot.slotBase()))->getConstructor(exec); } @@ -195,125 +195,132 @@ void JSNamedNodeMap::getPropertyNames(ExecState* exec, PropertyNameArray& proper Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSNamedNodeMap::getConstructor(ExecState* exec) +JSValue JSNamedNodeMap::getConstructor(ExecState* exec) { return getDOMConstructor<JSNamedNodeMapConstructor>(exec); } -JSValuePtr jsNamedNodeMapPrototypeFunctionGetNamedItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionGetNamedItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNamedNodeMap::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNamedNodeMap::s_info)) return throwError(exec, TypeError); JSNamedNodeMap* castedThisObj = static_cast<JSNamedNodeMap*>(asObject(thisValue)); NamedNodeMap* imp = static_cast<NamedNodeMap*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getNamedItem(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getNamedItem(name))); return result; } -JSValuePtr jsNamedNodeMapPrototypeFunctionSetNamedItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionSetNamedItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNamedNodeMap::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNamedNodeMap::s_info)) return throwError(exec, TypeError); JSNamedNodeMap* castedThisObj = static_cast<JSNamedNodeMap*>(asObject(thisValue)); NamedNodeMap* imp = static_cast<NamedNodeMap*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* node = toNode(args.at(exec, 0)); + Node* node = toNode(args.at(0)); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->setNamedItem(node, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->setNamedItem(node, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsNamedNodeMapPrototypeFunctionRemoveNamedItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionRemoveNamedItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNamedNodeMap::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNamedNodeMap::s_info)) return throwError(exec, TypeError); JSNamedNodeMap* castedThisObj = static_cast<JSNamedNodeMap*>(asObject(thisValue)); NamedNodeMap* imp = static_cast<NamedNodeMap*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->removeNamedItem(name, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->removeNamedItem(name, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsNamedNodeMapPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNamedNodeMap::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNamedNodeMap::s_info)) return throwError(exec, TypeError); JSNamedNodeMap* castedThisObj = static_cast<JSNamedNodeMap*>(asObject(thisValue)); NamedNodeMap* imp = static_cast<NamedNodeMap*>(castedThisObj->impl()); - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); return result; } -JSValuePtr jsNamedNodeMapPrototypeFunctionGetNamedItemNS(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionGetNamedItemNS(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNamedNodeMap::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNamedNodeMap::s_info)) return throwError(exec, TypeError); JSNamedNodeMap* castedThisObj = static_cast<JSNamedNodeMap*>(asObject(thisValue)); NamedNodeMap* imp = static_cast<NamedNodeMap*>(castedThisObj->impl()); - const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(exec, 0)); - const UString& localName = args.at(exec, 1)->toString(exec); + const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(0)); + const UString& localName = args.at(1).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getNamedItemNS(namespaceURI, localName))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getNamedItemNS(namespaceURI, localName))); return result; } -JSValuePtr jsNamedNodeMapPrototypeFunctionSetNamedItemNS(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionSetNamedItemNS(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNamedNodeMap::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNamedNodeMap::s_info)) return throwError(exec, TypeError); JSNamedNodeMap* castedThisObj = static_cast<JSNamedNodeMap*>(asObject(thisValue)); NamedNodeMap* imp = static_cast<NamedNodeMap*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* node = toNode(args.at(exec, 0)); + Node* node = toNode(args.at(0)); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->setNamedItemNS(node, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->setNamedItemNS(node, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsNamedNodeMapPrototypeFunctionRemoveNamedItemNS(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionRemoveNamedItemNS(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNamedNodeMap::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNamedNodeMap::s_info)) return throwError(exec, TypeError); JSNamedNodeMap* castedThisObj = static_cast<JSNamedNodeMap*>(asObject(thisValue)); NamedNodeMap* imp = static_cast<NamedNodeMap*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(exec, 0)); - const UString& localName = args.at(exec, 1)->toString(exec); + const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(0)); + const UString& localName = args.at(1).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->removeNamedItemNS(namespaceURI, localName, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->removeNamedItemNS(namespaceURI, localName, ec))); setDOMException(exec, ec); return result; } -JSValuePtr JSNamedNodeMap::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue JSNamedNodeMap::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSNamedNodeMap* thisObj = static_cast<JSNamedNodeMap*>(asObject(slot.slotBase())); return toJS(exec, static_cast<NamedNodeMap*>(thisObj->impl())->item(slot.index())); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, NamedNodeMap* object) +JSC::JSValue toJS(JSC::ExecState* exec, NamedNodeMap* object) { return getDOMObjectWrapper<JSNamedNodeMap>(exec, object); } -NamedNodeMap* toNamedNodeMap(JSC::JSValuePtr value) +NamedNodeMap* toNamedNodeMap(JSC::JSValue value) { - return value->isObject(&JSNamedNodeMap::s_info) ? static_cast<JSNamedNodeMap*>(asObject(value))->impl() : 0; + return value.isObject(&JSNamedNodeMap::s_info) ? static_cast<JSNamedNodeMap*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSNamedNodeMap.h b/src/3rdparty/webkit/WebCore/generated/JSNamedNodeMap.h index c58efe5272..f7c132e87f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNamedNodeMap.h +++ b/src/3rdparty/webkit/WebCore/generated/JSNamedNodeMap.h @@ -34,39 +34,40 @@ class JSNamedNodeMap : public DOMObject { public: JSNamedNodeMap(PassRefPtr<JSC::Structure>, PassRefPtr<NamedNodeMap>); virtual ~JSNamedNodeMap(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); NamedNodeMap* impl() const { return m_impl.get(); } private: RefPtr<NamedNodeMap> m_impl; - static JSC::JSValuePtr indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); private: static bool canGetItemsForName(JSC::ExecState*, NamedNodeMap*, const JSC::Identifier&); - static JSC::JSValuePtr nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValuePtr toJS(JSC::ExecState*, NamedNodeMap*); -NamedNodeMap* toNamedNodeMap(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, NamedNodeMap*); +NamedNodeMap* toNamedNodeMap(JSC::JSValue); class JSNamedNodeMapPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -75,17 +76,17 @@ public: // Functions -JSC::JSValuePtr jsNamedNodeMapPrototypeFunctionGetNamedItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNamedNodeMapPrototypeFunctionSetNamedItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNamedNodeMapPrototypeFunctionRemoveNamedItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNamedNodeMapPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNamedNodeMapPrototypeFunctionGetNamedItemNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNamedNodeMapPrototypeFunctionSetNamedItemNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNamedNodeMapPrototypeFunctionRemoveNamedItemNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionGetNamedItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionSetNamedItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionRemoveNamedItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionGetNamedItemNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionSetNamedItemNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionRemoveNamedItemNS(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsNamedNodeMapLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNamedNodeMapConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNamedNodeMapLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNamedNodeMapConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSNavigator.cpp b/src/3rdparty/webkit/WebCore/generated/JSNavigator.cpp index 441510f9f3..0d343fb011 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNavigator.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSNavigator.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSNavigator) +ASSERT_CLASS_FITS_IN_CELL(JSNavigator); /* Hash table */ @@ -85,9 +85,9 @@ static const HashTable JSNavigatorPrototypeTable = const ClassInfo JSNavigatorPrototype::s_info = { "NavigatorPrototype", 0, &JSNavigatorPrototypeTable, 0 }; -JSObject* JSNavigatorPrototype::self(ExecState* exec) +JSObject* JSNavigatorPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSNavigator>(exec); + return getDOMPrototype<JSNavigator>(exec, globalObject); } bool JSNavigatorPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -106,12 +106,11 @@ JSNavigator::JSNavigator(PassRefPtr<Structure> structure, PassRefPtr<Navigator> JSNavigator::~JSNavigator() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSNavigator::createPrototype(ExecState* exec) +JSObject* JSNavigator::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSNavigatorPrototype(JSNavigatorPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSNavigatorPrototype(JSNavigatorPrototype::createStructure(globalObject->objectPrototype())); } bool JSNavigator::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -119,108 +118,124 @@ bool JSNavigator::getOwnPropertySlot(ExecState* exec, const Identifier& property return getStaticValueSlot<JSNavigator, Base>(exec, &JSNavigatorTable, this, propertyName, slot); } -JSValuePtr jsNavigatorAppCodeName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNavigatorAppCodeName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Navigator* imp = static_cast<Navigator*>(static_cast<JSNavigator*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->appCodeName()); } -JSValuePtr jsNavigatorAppName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNavigatorAppName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Navigator* imp = static_cast<Navigator*>(static_cast<JSNavigator*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->appName()); } -JSValuePtr jsNavigatorAppVersion(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNavigatorAppVersion(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast<JSNavigator*>(asObject(slot.slotBase()))->appVersion(exec); + UNUSED_PARAM(exec); + Navigator* imp = static_cast<Navigator*>(static_cast<JSNavigator*>(asObject(slot.slotBase()))->impl()); + return jsString(exec, imp->appVersion()); } -JSValuePtr jsNavigatorLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNavigatorLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Navigator* imp = static_cast<Navigator*>(static_cast<JSNavigator*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->language()); } -JSValuePtr jsNavigatorUserAgent(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNavigatorUserAgent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Navigator* imp = static_cast<Navigator*>(static_cast<JSNavigator*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->userAgent()); } -JSValuePtr jsNavigatorPlatform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNavigatorPlatform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Navigator* imp = static_cast<Navigator*>(static_cast<JSNavigator*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->platform()); } -JSValuePtr jsNavigatorPlugins(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNavigatorPlugins(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Navigator* imp = static_cast<Navigator*>(static_cast<JSNavigator*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->plugins())); } -JSValuePtr jsNavigatorMimeTypes(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNavigatorMimeTypes(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Navigator* imp = static_cast<Navigator*>(static_cast<JSNavigator*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->mimeTypes())); } -JSValuePtr jsNavigatorProduct(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNavigatorProduct(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Navigator* imp = static_cast<Navigator*>(static_cast<JSNavigator*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->product()); } -JSValuePtr jsNavigatorProductSub(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNavigatorProductSub(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Navigator* imp = static_cast<Navigator*>(static_cast<JSNavigator*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->productSub()); } -JSValuePtr jsNavigatorVendor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNavigatorVendor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Navigator* imp = static_cast<Navigator*>(static_cast<JSNavigator*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->vendor()); } -JSValuePtr jsNavigatorVendorSub(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNavigatorVendorSub(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Navigator* imp = static_cast<Navigator*>(static_cast<JSNavigator*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->vendorSub()); } -JSValuePtr jsNavigatorCookieEnabled(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNavigatorCookieEnabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Navigator* imp = static_cast<Navigator*>(static_cast<JSNavigator*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->cookieEnabled()); } -JSValuePtr jsNavigatorOnLine(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNavigatorOnLine(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Navigator* imp = static_cast<Navigator*>(static_cast<JSNavigator*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->onLine()); } -JSValuePtr jsNavigatorPrototypeFunctionJavaEnabled(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNavigatorPrototypeFunctionJavaEnabled(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNavigator::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNavigator::s_info)) return throwError(exec, TypeError); JSNavigator* castedThisObj = static_cast<JSNavigator*>(asObject(thisValue)); Navigator* imp = static_cast<Navigator*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsBoolean(imp->javaEnabled()); + JSC::JSValue result = jsBoolean(imp->javaEnabled()); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, Navigator* object) +JSC::JSValue toJS(JSC::ExecState* exec, Navigator* object) { return getDOMObjectWrapper<JSNavigator>(exec, object); } -Navigator* toNavigator(JSC::JSValuePtr value) +Navigator* toNavigator(JSC::JSValue value) { - return value->isObject(&JSNavigator::s_info) ? static_cast<JSNavigator*>(asObject(value))->impl() : 0; + return value.isObject(&JSNavigator::s_info) ? static_cast<JSNavigator*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSNavigator.h b/src/3rdparty/webkit/WebCore/generated/JSNavigator.h index fbbdd310dd..0a3a5df598 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNavigator.h +++ b/src/3rdparty/webkit/WebCore/generated/JSNavigator.h @@ -34,37 +34,35 @@ class JSNavigator : public DOMObject { public: JSNavigator(PassRefPtr<JSC::Structure>, PassRefPtr<Navigator>); virtual ~JSNavigator(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void mark(); - - // Custom attributes - JSC::JSValuePtr appVersion(JSC::ExecState*) const; Navigator* impl() const { return m_impl.get(); } private: RefPtr<Navigator> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, Navigator*); -Navigator* toNavigator(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, Navigator*); +Navigator* toNavigator(JSC::JSValue); class JSNavigatorPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -73,23 +71,23 @@ public: // Functions -JSC::JSValuePtr jsNavigatorPrototypeFunctionJavaEnabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNavigatorPrototypeFunctionJavaEnabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsNavigatorAppCodeName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNavigatorAppName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNavigatorAppVersion(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNavigatorLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNavigatorUserAgent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNavigatorPlatform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNavigatorPlugins(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNavigatorMimeTypes(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNavigatorProduct(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNavigatorProductSub(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNavigatorVendor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNavigatorVendorSub(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNavigatorCookieEnabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNavigatorOnLine(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNavigatorAppCodeName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNavigatorAppName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNavigatorAppVersion(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNavigatorLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNavigatorUserAgent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNavigatorPlatform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNavigatorPlugins(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNavigatorMimeTypes(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNavigatorProduct(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNavigatorProductSub(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNavigatorVendor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNavigatorVendorSub(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNavigatorCookieEnabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNavigatorOnLine(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSNode.cpp b/src/3rdparty/webkit/WebCore/generated/JSNode.cpp index aa8fb00e02..6cb55ee391 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNode.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSNode.cpp @@ -25,16 +25,24 @@ #include <wtf/GetPtr.h> #include "Document.h" +#include "Element.h" +#include "Event.h" +#include "EventListener.h" +#include "Frame.h" +#include "JSDOMGlobalObject.h" #include "JSDocument.h" +#include "JSElement.h" +#include "JSEvent.h" +#include "JSEventListener.h" #include "JSNamedNodeMap.h" #include "JSNode.h" #include "JSNodeList.h" #include "KURL.h" #include "NameNodeList.h" -#include "NamedAttrMap.h" #include "NamedNodeMap.h" #include "Node.h" #include "NodeList.h" +#include "RegisteredEventListener.h" #include <runtime/Error.h> #include <runtime/JSNumberCell.h> @@ -43,11 +51,11 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSNode) +ASSERT_CLASS_FITS_IN_CELL(JSNode); /* Hash table */ -static const HashTableValue JSNodeTableValues[19] = +static const HashTableValue JSNodeTableValues[59] = { { "nodeName", DontDelete|ReadOnly, (intptr_t)jsNodeNodeName, (intptr_t)0 }, { "nodeValue", DontDelete, (intptr_t)jsNodeNodeValue, (intptr_t)setJSNodeNodeValue }, @@ -66,6 +74,46 @@ static const HashTableValue JSNodeTableValues[19] = { "baseURI", DontDelete|ReadOnly, (intptr_t)jsNodeBaseURI, (intptr_t)0 }, { "textContent", DontDelete, (intptr_t)jsNodeTextContent, (intptr_t)setJSNodeTextContent }, { "parentElement", DontDelete|ReadOnly, (intptr_t)jsNodeParentElement, (intptr_t)0 }, + { "onabort", DontDelete|DontEnum, (intptr_t)jsNodeOnabort, (intptr_t)setJSNodeOnabort }, + { "onblur", DontDelete|DontEnum, (intptr_t)jsNodeOnblur, (intptr_t)setJSNodeOnblur }, + { "onchange", DontDelete|DontEnum, (intptr_t)jsNodeOnchange, (intptr_t)setJSNodeOnchange }, + { "onclick", DontDelete|DontEnum, (intptr_t)jsNodeOnclick, (intptr_t)setJSNodeOnclick }, + { "oncontextmenu", DontDelete|DontEnum, (intptr_t)jsNodeOncontextmenu, (intptr_t)setJSNodeOncontextmenu }, + { "ondblclick", DontDelete|DontEnum, (intptr_t)jsNodeOndblclick, (intptr_t)setJSNodeOndblclick }, + { "onerror", DontDelete|DontEnum, (intptr_t)jsNodeOnerror, (intptr_t)setJSNodeOnerror }, + { "onfocus", DontDelete|DontEnum, (intptr_t)jsNodeOnfocus, (intptr_t)setJSNodeOnfocus }, + { "oninput", DontDelete|DontEnum, (intptr_t)jsNodeOninput, (intptr_t)setJSNodeOninput }, + { "onkeydown", DontDelete|DontEnum, (intptr_t)jsNodeOnkeydown, (intptr_t)setJSNodeOnkeydown }, + { "onkeypress", DontDelete|DontEnum, (intptr_t)jsNodeOnkeypress, (intptr_t)setJSNodeOnkeypress }, + { "onkeyup", DontDelete|DontEnum, (intptr_t)jsNodeOnkeyup, (intptr_t)setJSNodeOnkeyup }, + { "onload", DontDelete|DontEnum, (intptr_t)jsNodeOnload, (intptr_t)setJSNodeOnload }, + { "onmousedown", DontDelete|DontEnum, (intptr_t)jsNodeOnmousedown, (intptr_t)setJSNodeOnmousedown }, + { "onmousemove", DontDelete|DontEnum, (intptr_t)jsNodeOnmousemove, (intptr_t)setJSNodeOnmousemove }, + { "onmouseout", DontDelete|DontEnum, (intptr_t)jsNodeOnmouseout, (intptr_t)setJSNodeOnmouseout }, + { "onmouseover", DontDelete|DontEnum, (intptr_t)jsNodeOnmouseover, (intptr_t)setJSNodeOnmouseover }, + { "onmouseup", DontDelete|DontEnum, (intptr_t)jsNodeOnmouseup, (intptr_t)setJSNodeOnmouseup }, + { "onmousewheel", DontDelete|DontEnum, (intptr_t)jsNodeOnmousewheel, (intptr_t)setJSNodeOnmousewheel }, + { "onbeforecut", DontDelete|DontEnum, (intptr_t)jsNodeOnbeforecut, (intptr_t)setJSNodeOnbeforecut }, + { "oncut", DontDelete|DontEnum, (intptr_t)jsNodeOncut, (intptr_t)setJSNodeOncut }, + { "onbeforecopy", DontDelete|DontEnum, (intptr_t)jsNodeOnbeforecopy, (intptr_t)setJSNodeOnbeforecopy }, + { "oncopy", DontDelete|DontEnum, (intptr_t)jsNodeOncopy, (intptr_t)setJSNodeOncopy }, + { "onbeforepaste", DontDelete|DontEnum, (intptr_t)jsNodeOnbeforepaste, (intptr_t)setJSNodeOnbeforepaste }, + { "onpaste", DontDelete|DontEnum, (intptr_t)jsNodeOnpaste, (intptr_t)setJSNodeOnpaste }, + { "ondragenter", DontDelete|DontEnum, (intptr_t)jsNodeOndragenter, (intptr_t)setJSNodeOndragenter }, + { "ondragover", DontDelete|DontEnum, (intptr_t)jsNodeOndragover, (intptr_t)setJSNodeOndragover }, + { "ondragleave", DontDelete|DontEnum, (intptr_t)jsNodeOndragleave, (intptr_t)setJSNodeOndragleave }, + { "ondrop", DontDelete|DontEnum, (intptr_t)jsNodeOndrop, (intptr_t)setJSNodeOndrop }, + { "ondragstart", DontDelete|DontEnum, (intptr_t)jsNodeOndragstart, (intptr_t)setJSNodeOndragstart }, + { "ondrag", DontDelete|DontEnum, (intptr_t)jsNodeOndrag, (intptr_t)setJSNodeOndrag }, + { "ondragend", DontDelete|DontEnum, (intptr_t)jsNodeOndragend, (intptr_t)setJSNodeOndragend }, + { "onreset", DontDelete|DontEnum, (intptr_t)jsNodeOnreset, (intptr_t)setJSNodeOnreset }, + { "onresize", DontDelete|DontEnum, (intptr_t)jsNodeOnresize, (intptr_t)setJSNodeOnresize }, + { "onscroll", DontDelete|DontEnum, (intptr_t)jsNodeOnscroll, (intptr_t)setJSNodeOnscroll }, + { "onsearch", DontDelete|DontEnum, (intptr_t)jsNodeOnsearch, (intptr_t)setJSNodeOnsearch }, + { "onselect", DontDelete|DontEnum, (intptr_t)jsNodeOnselect, (intptr_t)setJSNodeOnselect }, + { "onselectstart", DontDelete|DontEnum, (intptr_t)jsNodeOnselectstart, (intptr_t)setJSNodeOnselectstart }, + { "onsubmit", DontDelete|DontEnum, (intptr_t)jsNodeOnsubmit, (intptr_t)setJSNodeOnsubmit }, + { "onunload", DontDelete|DontEnum, (intptr_t)jsNodeOnunload, (intptr_t)setJSNodeOnunload }, { "constructor", DontEnum|ReadOnly, (intptr_t)jsNodeConstructor, (intptr_t)0 }, { 0, 0, 0, 0 } }; @@ -74,7 +122,7 @@ static const HashTable JSNodeTable = #if ENABLE(PERFECT_HASH_SIZE) { 4095, JSNodeTableValues, 0 }; #else - { 68, 63, JSNodeTableValues, 0 }; + { 140, 127, JSNodeTableValues, 0 }; #endif /* Hash table for constructor */ @@ -114,13 +162,13 @@ public: JSNodeConstructor(ExecState* exec) : DOMObject(JSNodeConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSNodePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSNodePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -135,7 +183,7 @@ bool JSNodeConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& pr /* Hash table for prototype */ -static const HashTableValue JSNodePrototypeTableValues[34] = +static const HashTableValue JSNodePrototypeTableValues[37] = { { "ELEMENT_NODE", DontDelete|ReadOnly, (intptr_t)jsNodeELEMENT_NODE, (intptr_t)0 }, { "ATTRIBUTE_NODE", DontDelete|ReadOnly, (intptr_t)jsNodeATTRIBUTE_NODE, (intptr_t)0 }, @@ -170,6 +218,9 @@ static const HashTableValue JSNodePrototypeTableValues[34] = { "isDefaultNamespace", DontDelete|Function, (intptr_t)jsNodePrototypeFunctionIsDefaultNamespace, (intptr_t)1 }, { "lookupNamespaceURI", DontDelete|Function, (intptr_t)jsNodePrototypeFunctionLookupNamespaceURI, (intptr_t)1 }, { "compareDocumentPosition", DontDelete|Function, (intptr_t)jsNodePrototypeFunctionCompareDocumentPosition, (intptr_t)1 }, + { "addEventListener", DontDelete|Function, (intptr_t)jsNodePrototypeFunctionAddEventListener, (intptr_t)3 }, + { "removeEventListener", DontDelete|Function, (intptr_t)jsNodePrototypeFunctionRemoveEventListener, (intptr_t)3 }, + { "dispatchEvent", DontDelete|Function, (intptr_t)jsNodePrototypeFunctionDispatchEvent, (intptr_t)1 }, { 0, 0, 0, 0 } }; @@ -182,9 +233,9 @@ static const HashTable JSNodePrototypeTable = const ClassInfo JSNodePrototype::s_info = { "NodePrototype", 0, &JSNodePrototypeTable, 0 }; -JSObject* JSNodePrototype::self(ExecState* exec) +JSObject* JSNodePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSNode>(exec); + return getDOMPrototype<JSNode>(exec, globalObject); } bool JSNodePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -202,127 +253,584 @@ JSNode::JSNode(PassRefPtr<Structure> structure, PassRefPtr<Node> impl) JSNode::~JSNode() { + invalidateEventListeners(m_impl->eventListeners()); forgetDOMNode(m_impl->document(), m_impl.get()); - } -JSObject* JSNode::createPrototype(ExecState* exec) +JSObject* JSNode::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSNodePrototype(JSNodePrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSNodePrototype(JSNodePrototype::createStructure(globalObject->objectPrototype())); } -JSValuePtr jsNodeNodeName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeNodeName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->nodeName()); } -JSValuePtr jsNodeNodeValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeNodeValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->nodeValue()); } -JSValuePtr jsNodeNodeType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeNodeType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->nodeType()); } -JSValuePtr jsNodeParentNode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeParentNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->parentNode())); } -JSValuePtr jsNodeChildNodes(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeChildNodes(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->childNodes())); } -JSValuePtr jsNodeFirstChild(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeFirstChild(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->firstChild())); } -JSValuePtr jsNodeLastChild(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeLastChild(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->lastChild())); } -JSValuePtr jsNodePreviousSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodePreviousSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->previousSibling())); } -JSValuePtr jsNodeNextSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeNextSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nextSibling())); } -JSValuePtr jsNodeAttributes(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeAttributes(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->attributes())); } -JSValuePtr jsNodeOwnerDocument(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeOwnerDocument(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->ownerDocument())); } -JSValuePtr jsNodeNamespaceURI(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeNamespaceURI(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->namespaceURI()); } -JSValuePtr jsNodePrefix(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodePrefix(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->prefix()); } -JSValuePtr jsNodeLocalName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeLocalName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->localName()); } -JSValuePtr jsNodeBaseURI(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeBaseURI(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->baseURI()); } -JSValuePtr jsNodeTextContent(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeTextContent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->textContent()); } -JSValuePtr jsNodeParentElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeParentElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->parentElement())); } -JSValuePtr jsNodeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeOnabort(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onabort()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnblur(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onblur()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnchange(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onchange()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnclick(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onclick()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOncontextmenu(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->oncontextmenu()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOndblclick(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondblclick()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onerror()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnfocus(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onfocus()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOninput(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->oninput()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnkeydown(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onkeydown()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnkeypress(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onkeypress()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnkeyup(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onkeyup()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnload(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onload()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnmousedown(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onmousedown()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnmousemove(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onmousemove()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnmouseout(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onmouseout()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnmouseover(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onmouseover()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnmouseup(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onmouseup()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnmousewheel(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onmousewheel()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnbeforecut(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onbeforecut()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOncut(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->oncut()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnbeforecopy(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onbeforecopy()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOncopy(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->oncopy()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnbeforepaste(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onbeforepaste()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnpaste(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onpaste()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOndragenter(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondragenter()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOndragover(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondragover()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOndragleave(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondragleave()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOndrop(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondrop()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOndragstart(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondragstart()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOndrag(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondrag()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOndragend(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->ondragend()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnreset(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onreset()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnresize(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onresize()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnscroll(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onscroll()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnsearch(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onsearch()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnselect(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onselect()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnselectstart(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onselectstart()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnsubmit(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onsubmit()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeOnunload(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(asObject(slot.slotBase()))->impl()); + if (EventListener* listener = imp->onunload()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsNodeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSNode*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSNode::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSNode::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSNode, Base>(exec, propertyName, value, &JSNodeTable, this, slot); } -void setJSNodeNodeValue(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSNodeNodeValue(ExecState* exec, JSObject* thisObject, JSValue value) { Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -330,7 +838,7 @@ void setJSNodeNodeValue(ExecState* exec, JSObject* thisObject, JSValuePtr value) setDOMException(exec, ec); } -void setJSNodePrefix(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSNodePrefix(ExecState* exec, JSObject* thisObject, JSValue value) { Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -338,7 +846,7 @@ void setJSNodePrefix(ExecState* exec, JSObject* thisObject, JSValuePtr value) setDOMException(exec, ec); } -void setJSNodeTextContent(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSNodeTextContent(ExecState* exec, JSObject* thisObject, JSValue value) { Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -346,71 +854,478 @@ void setJSNodeTextContent(ExecState* exec, JSObject* thisObject, JSValuePtr valu setDOMException(exec, ec); } -JSValuePtr JSNode::getConstructor(ExecState* exec) +void setJSNodeOnabort(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnabort(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnblur(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnblur(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnchange(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnchange(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnclick(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnclick(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOncontextmenu(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOncontextmenu(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOndblclick(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOndblclick(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnerror(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnerror(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnfocus(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnfocus(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOninput(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOninput(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnkeydown(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnkeydown(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnkeypress(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnkeypress(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnkeyup(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnkeyup(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnload(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnload(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnmousedown(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnmousedown(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnmousemove(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnmousemove(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnmouseout(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnmouseout(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnmouseover(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnmouseover(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnmouseup(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnmouseup(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnmousewheel(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnmousewheel(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnbeforecut(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnbeforecut(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOncut(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOncut(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnbeforecopy(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnbeforecopy(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOncopy(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOncopy(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnbeforepaste(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnbeforepaste(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnpaste(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnpaste(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOndragenter(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOndragenter(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOndragover(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOndragover(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOndragleave(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOndragleave(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOndrop(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOndrop(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOndragstart(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOndragstart(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOndrag(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOndrag(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOndragend(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOndragend(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnreset(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnreset(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnresize(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnresize(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnscroll(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnscroll(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnsearch(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnsearch(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnselect(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnselect(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnselectstart(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnselectstart(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnsubmit(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnsubmit(globalObject->createJSAttributeEventListener(value)); +} + +void setJSNodeOnunload(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + Node* imp = static_cast<Node*>(static_cast<JSNode*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnunload(globalObject->createJSAttributeEventListener(value)); +} + +JSValue JSNode::getConstructor(ExecState* exec) { return getDOMConstructor<JSNodeConstructor>(exec); } -JSValuePtr jsNodePrototypeFunctionInsertBefore(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodePrototypeFunctionInsertBefore(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNode::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) return throwError(exec, TypeError); JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); return castedThisObj->insertBefore(exec, args); } -JSValuePtr jsNodePrototypeFunctionReplaceChild(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodePrototypeFunctionReplaceChild(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNode::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) return throwError(exec, TypeError); JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); return castedThisObj->replaceChild(exec, args); } -JSValuePtr jsNodePrototypeFunctionRemoveChild(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodePrototypeFunctionRemoveChild(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNode::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) return throwError(exec, TypeError); JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); return castedThisObj->removeChild(exec, args); } -JSValuePtr jsNodePrototypeFunctionAppendChild(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodePrototypeFunctionAppendChild(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNode::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) return throwError(exec, TypeError); JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); return castedThisObj->appendChild(exec, args); } -JSValuePtr jsNodePrototypeFunctionHasChildNodes(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodePrototypeFunctionHasChildNodes(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNode::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) return throwError(exec, TypeError); JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); Node* imp = static_cast<Node*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsBoolean(imp->hasChildNodes()); + JSC::JSValue result = jsBoolean(imp->hasChildNodes()); return result; } -JSValuePtr jsNodePrototypeFunctionCloneNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodePrototypeFunctionCloneNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNode::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) return throwError(exec, TypeError); JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); Node* imp = static_cast<Node*>(castedThisObj->impl()); - bool deep = args.at(exec, 0)->toBoolean(exec); + bool deep = args.at(0).toBoolean(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->cloneNode(deep))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->cloneNode(deep))); return result; } -JSValuePtr jsNodePrototypeFunctionNormalize(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodePrototypeFunctionNormalize(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNode::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) return throwError(exec, TypeError); JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); Node* imp = static_cast<Node*>(castedThisObj->impl()); @@ -419,205 +1334,247 @@ JSValuePtr jsNodePrototypeFunctionNormalize(ExecState* exec, JSObject*, JSValueP return jsUndefined(); } -JSValuePtr jsNodePrototypeFunctionIsSupported(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodePrototypeFunctionIsSupported(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNode::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) return throwError(exec, TypeError); JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); Node* imp = static_cast<Node*>(castedThisObj->impl()); - const UString& feature = args.at(exec, 0)->toString(exec); - const UString& version = valueToStringWithNullCheck(exec, args.at(exec, 1)); + const UString& feature = args.at(0).toString(exec); + const UString& version = valueToStringWithNullCheck(exec, args.at(1)); - JSC::JSValuePtr result = jsBoolean(imp->isSupported(feature, version)); + JSC::JSValue result = jsBoolean(imp->isSupported(feature, version)); return result; } -JSValuePtr jsNodePrototypeFunctionHasAttributes(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodePrototypeFunctionHasAttributes(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNode::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) return throwError(exec, TypeError); JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); Node* imp = static_cast<Node*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsBoolean(imp->hasAttributes()); + JSC::JSValue result = jsBoolean(imp->hasAttributes()); return result; } -JSValuePtr jsNodePrototypeFunctionIsSameNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodePrototypeFunctionIsSameNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNode::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) return throwError(exec, TypeError); JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); Node* imp = static_cast<Node*>(castedThisObj->impl()); - Node* other = toNode(args.at(exec, 0)); + Node* other = toNode(args.at(0)); - JSC::JSValuePtr result = jsBoolean(imp->isSameNode(other)); + JSC::JSValue result = jsBoolean(imp->isSameNode(other)); return result; } -JSValuePtr jsNodePrototypeFunctionIsEqualNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodePrototypeFunctionIsEqualNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNode::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) return throwError(exec, TypeError); JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); Node* imp = static_cast<Node*>(castedThisObj->impl()); - Node* other = toNode(args.at(exec, 0)); + Node* other = toNode(args.at(0)); - JSC::JSValuePtr result = jsBoolean(imp->isEqualNode(other)); + JSC::JSValue result = jsBoolean(imp->isEqualNode(other)); return result; } -JSValuePtr jsNodePrototypeFunctionLookupPrefix(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodePrototypeFunctionLookupPrefix(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNode::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) return throwError(exec, TypeError); JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); Node* imp = static_cast<Node*>(castedThisObj->impl()); - const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(exec, 0)); + const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(0)); - JSC::JSValuePtr result = jsStringOrNull(exec, imp->lookupPrefix(namespaceURI)); + JSC::JSValue result = jsStringOrNull(exec, imp->lookupPrefix(namespaceURI)); return result; } -JSValuePtr jsNodePrototypeFunctionIsDefaultNamespace(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodePrototypeFunctionIsDefaultNamespace(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNode::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) return throwError(exec, TypeError); JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); Node* imp = static_cast<Node*>(castedThisObj->impl()); - const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(exec, 0)); + const UString& namespaceURI = valueToStringWithNullCheck(exec, args.at(0)); - JSC::JSValuePtr result = jsBoolean(imp->isDefaultNamespace(namespaceURI)); + JSC::JSValue result = jsBoolean(imp->isDefaultNamespace(namespaceURI)); return result; } -JSValuePtr jsNodePrototypeFunctionLookupNamespaceURI(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodePrototypeFunctionLookupNamespaceURI(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNode::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) return throwError(exec, TypeError); JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); Node* imp = static_cast<Node*>(castedThisObj->impl()); - const UString& prefix = valueToStringWithNullCheck(exec, args.at(exec, 0)); + const UString& prefix = valueToStringWithNullCheck(exec, args.at(0)); - JSC::JSValuePtr result = jsStringOrNull(exec, imp->lookupNamespaceURI(prefix)); + JSC::JSValue result = jsStringOrNull(exec, imp->lookupNamespaceURI(prefix)); return result; } -JSValuePtr jsNodePrototypeFunctionCompareDocumentPosition(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodePrototypeFunctionCompareDocumentPosition(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNode::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) return throwError(exec, TypeError); JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); Node* imp = static_cast<Node*>(castedThisObj->impl()); - Node* other = toNode(args.at(exec, 0)); + Node* other = toNode(args.at(0)); + + + JSC::JSValue result = jsNumber(exec, imp->compareDocumentPosition(other)); + return result; +} +JSValue JSC_HOST_CALL jsNodePrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) + return throwError(exec, TypeError); + JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); + return castedThisObj->addEventListener(exec, args); +} - JSC::JSValuePtr result = jsNumber(exec, imp->compareDocumentPosition(other)); +JSValue JSC_HOST_CALL jsNodePrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) + return throwError(exec, TypeError); + JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); + return castedThisObj->removeEventListener(exec, args); +} + +JSValue JSC_HOST_CALL jsNodePrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNode::s_info)) + return throwError(exec, TypeError); + JSNode* castedThisObj = static_cast<JSNode*>(asObject(thisValue)); + Node* imp = static_cast<Node*>(castedThisObj->impl()); + ExceptionCode ec = 0; + Event* event = toEvent(args.at(0)); + + + JSC::JSValue result = jsBoolean(imp->dispatchEvent(event, ec)); + setDOMException(exec, ec); return result; } // Constant getters -JSValuePtr jsNodeELEMENT_NODE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeELEMENT_NODE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsNodeATTRIBUTE_NODE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeATTRIBUTE_NODE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsNodeTEXT_NODE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeTEXT_NODE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsNodeCDATA_SECTION_NODE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeCDATA_SECTION_NODE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSValuePtr jsNodeENTITY_REFERENCE_NODE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeENTITY_REFERENCE_NODE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(5)); } -JSValuePtr jsNodeENTITY_NODE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeENTITY_NODE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(6)); } -JSValuePtr jsNodePROCESSING_INSTRUCTION_NODE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodePROCESSING_INSTRUCTION_NODE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(7)); } -JSValuePtr jsNodeCOMMENT_NODE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeCOMMENT_NODE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(8)); } -JSValuePtr jsNodeDOCUMENT_NODE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeDOCUMENT_NODE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(9)); } -JSValuePtr jsNodeDOCUMENT_TYPE_NODE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeDOCUMENT_TYPE_NODE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(10)); } -JSValuePtr jsNodeDOCUMENT_FRAGMENT_NODE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeDOCUMENT_FRAGMENT_NODE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(11)); } -JSValuePtr jsNodeNOTATION_NODE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeNOTATION_NODE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(12)); } -JSValuePtr jsNodeDOCUMENT_POSITION_DISCONNECTED(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeDOCUMENT_POSITION_DISCONNECTED(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x01)); } -JSValuePtr jsNodeDOCUMENT_POSITION_PRECEDING(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeDOCUMENT_POSITION_PRECEDING(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x02)); } -JSValuePtr jsNodeDOCUMENT_POSITION_FOLLOWING(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeDOCUMENT_POSITION_FOLLOWING(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x04)); } -JSValuePtr jsNodeDOCUMENT_POSITION_CONTAINS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeDOCUMENT_POSITION_CONTAINS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x08)); } -JSValuePtr jsNodeDOCUMENT_POSITION_CONTAINED_BY(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeDOCUMENT_POSITION_CONTAINED_BY(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x10)); } -JSValuePtr jsNodeDOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeDOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x20)); } -Node* toNode(JSC::JSValuePtr value) +Node* toNode(JSC::JSValue value) { - return value->isObject(&JSNode::s_info) ? static_cast<JSNode*>(asObject(value))->impl() : 0; + return value.isObject(&JSNode::s_info) ? static_cast<JSNode*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSNode.h b/src/3rdparty/webkit/WebCore/generated/JSNode.h index 6cb1f0d94d..fd1f2d069a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNode.h +++ b/src/3rdparty/webkit/WebCore/generated/JSNode.h @@ -24,7 +24,6 @@ #include "JSDOMBinding.h" #include <runtime/JSGlobalObject.h> #include <runtime/ObjectPrototype.h> -#include "EventTargetNode.h" #include <runtime/Lookup.h> #include <wtf/AlwaysInline.h> @@ -37,26 +36,30 @@ class JSNode : public DOMObject { public: JSNode(PassRefPtr<JSC::Structure>, PassRefPtr<Node>); virtual ~JSNode(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void mark(); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + virtual void pushEventHandlerScope(JSC::ExecState*, JSC::ScopeChain&) const; + + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom functions - JSC::JSValuePtr insertBefore(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr replaceChild(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr removeChild(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr appendChild(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue insertBefore(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue replaceChild(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue removeChild(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue appendChild(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue addEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue removeEventListener(JSC::ExecState*, const JSC::ArgList&); Node* impl() const { return m_impl.get(); } private: @@ -68,18 +71,18 @@ ALWAYS_INLINE bool JSNode::getOwnPropertySlot(JSC::ExecState* exec, const JSC::I return JSC::getStaticValueSlot<JSNode, Base>(exec, s_info.staticPropHashTable, this, propertyName, slot); } -JSC::JSValuePtr toJS(JSC::ExecState*, Node*); -inline JSC::JSValuePtr toJS(JSC::ExecState* exec, EventTargetNode* node) { return toJS(exec, static_cast<Node*>(node)); } -Node* toNode(JSC::JSValuePtr); -JSC::JSValuePtr toJSNewlyCreated(JSC::ExecState*, Node*); +JSC::JSValue toJS(JSC::ExecState*, Node*); +Node* toNode(JSC::JSValue); +JSC::JSValue toJSNewlyCreated(JSC::ExecState*, Node*); class JSNodePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -88,64 +91,147 @@ public: // Functions -JSC::JSValuePtr jsNodePrototypeFunctionInsertBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNodePrototypeFunctionReplaceChild(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNodePrototypeFunctionRemoveChild(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNodePrototypeFunctionAppendChild(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNodePrototypeFunctionHasChildNodes(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNodePrototypeFunctionCloneNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNodePrototypeFunctionNormalize(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNodePrototypeFunctionIsSupported(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNodePrototypeFunctionHasAttributes(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNodePrototypeFunctionIsSameNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNodePrototypeFunctionIsEqualNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNodePrototypeFunctionLookupPrefix(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNodePrototypeFunctionIsDefaultNamespace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNodePrototypeFunctionLookupNamespaceURI(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNodePrototypeFunctionCompareDocumentPosition(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionInsertBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionReplaceChild(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionRemoveChild(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionAppendChild(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionHasChildNodes(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionCloneNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionNormalize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionIsSupported(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionHasAttributes(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionIsSameNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionIsEqualNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionLookupPrefix(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionIsDefaultNamespace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionLookupNamespaceURI(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionCompareDocumentPosition(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodePrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsNodeNodeName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeNodeValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSNodeNodeValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsNodeNodeType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeParentNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeChildNodes(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeFirstChild(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeLastChild(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodePreviousSibling(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeNextSibling(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeAttributes(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeOwnerDocument(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeNamespaceURI(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodePrefix(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSNodePrefix(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsNodeLocalName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeBaseURI(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeTextContent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSNodeTextContent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsNodeParentElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeNodeName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeNodeValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeNodeValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeNodeType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeParentNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeChildNodes(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFirstChild(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeLastChild(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodePreviousSibling(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeNextSibling(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeAttributes(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeOwnerDocument(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeNamespaceURI(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodePrefix(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodePrefix(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeLocalName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeBaseURI(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeTextContent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeTextContent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeParentElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeOnabort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnabort(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnblur(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnblur(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnchange(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnchange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnclick(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnclick(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOncontextmenu(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOncontextmenu(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOndblclick(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOndblclick(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnfocus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnfocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOninput(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOninput(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnkeydown(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnkeydown(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnkeypress(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnkeypress(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnkeyup(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnkeyup(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnload(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnmousedown(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnmousedown(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnmousemove(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnmousemove(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnmouseout(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnmouseout(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnmouseover(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnmouseover(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnmouseup(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnmouseup(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnmousewheel(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnmousewheel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnbeforecut(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnbeforecut(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOncut(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOncut(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnbeforecopy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnbeforecopy(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOncopy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOncopy(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnbeforepaste(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnbeforepaste(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnpaste(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnpaste(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOndragenter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOndragenter(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOndragover(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOndragover(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOndragleave(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOndragleave(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOndrop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOndrop(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOndragstart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOndragstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOndrag(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOndrag(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOndragend(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOndragend(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnreset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnreset(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnresize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnresize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnscroll(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnscroll(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnsearch(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnsearch(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnselect(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnselect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnselectstart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnselectstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnsubmit(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnsubmit(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeOnunload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSNodeOnunload(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsNodeConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsNodeELEMENT_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeATTRIBUTE_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeTEXT_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeCDATA_SECTION_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeENTITY_REFERENCE_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeENTITY_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodePROCESSING_INSTRUCTION_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeCOMMENT_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeDOCUMENT_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeDOCUMENT_TYPE_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeDOCUMENT_FRAGMENT_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeNOTATION_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeDOCUMENT_POSITION_DISCONNECTED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeDOCUMENT_POSITION_PRECEDING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeDOCUMENT_POSITION_FOLLOWING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeDOCUMENT_POSITION_CONTAINS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeDOCUMENT_POSITION_CONTAINED_BY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeDOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeELEMENT_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeATTRIBUTE_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeTEXT_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeCDATA_SECTION_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeENTITY_REFERENCE_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeENTITY_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodePROCESSING_INSTRUCTION_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeCOMMENT_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeDOCUMENT_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeDOCUMENT_TYPE_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeDOCUMENT_FRAGMENT_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeNOTATION_NODE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeDOCUMENT_POSITION_DISCONNECTED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeDOCUMENT_POSITION_PRECEDING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeDOCUMENT_POSITION_FOLLOWING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeDOCUMENT_POSITION_CONTAINS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeDOCUMENT_POSITION_CONTAINED_BY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeDOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSNodeFilter.cpp b/src/3rdparty/webkit/WebCore/generated/JSNodeFilter.cpp index 2492f634a1..d0eb79f920 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNodeFilter.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSNodeFilter.cpp @@ -33,7 +33,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSNodeFilter) +ASSERT_CLASS_FITS_IN_CELL(JSNodeFilter); /* Hash table */ @@ -85,13 +85,13 @@ public: JSNodeFilterConstructor(ExecState* exec) : DOMObject(JSNodeFilterConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSNodeFilterPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSNodeFilterPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -137,9 +137,9 @@ static const HashTable JSNodeFilterPrototypeTable = const ClassInfo JSNodeFilterPrototype::s_info = { "NodeFilterPrototype", 0, &JSNodeFilterPrototypeTable, 0 }; -JSObject* JSNodeFilterPrototype::self(ExecState* exec) +JSObject* JSNodeFilterPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSNodeFilter>(exec); + return getDOMPrototype<JSNodeFilter>(exec, globalObject); } bool JSNodeFilterPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -158,12 +158,11 @@ JSNodeFilter::JSNodeFilter(PassRefPtr<Structure> structure, PassRefPtr<NodeFilte JSNodeFilter::~JSNodeFilter() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSNodeFilter::createPrototype(ExecState* exec) +JSObject* JSNodeFilter::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSNodeFilterPrototype(JSNodeFilterPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSNodeFilterPrototype(JSNodeFilterPrototype::createStructure(globalObject->objectPrototype())); } bool JSNodeFilter::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -171,18 +170,19 @@ bool JSNodeFilter::getOwnPropertySlot(ExecState* exec, const Identifier& propert return getStaticValueSlot<JSNodeFilter, Base>(exec, &JSNodeFilterTable, this, propertyName, slot); } -JSValuePtr jsNodeFilterConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeFilterConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSNodeFilter*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSNodeFilter::getConstructor(ExecState* exec) +JSValue JSNodeFilter::getConstructor(ExecState* exec) { return getDOMConstructor<JSNodeFilterConstructor>(exec); } -JSValuePtr jsNodeFilterPrototypeFunctionAcceptNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodeFilterPrototypeFunctionAcceptNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNodeFilter::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNodeFilter::s_info)) return throwError(exec, TypeError); JSNodeFilter* castedThisObj = static_cast<JSNodeFilter*>(asObject(thisValue)); return castedThisObj->acceptNode(exec, args); @@ -190,87 +190,87 @@ JSValuePtr jsNodeFilterPrototypeFunctionAcceptNode(ExecState* exec, JSObject*, J // Constant getters -JSValuePtr jsNodeFilterFILTER_ACCEPT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeFilterFILTER_ACCEPT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsNodeFilterFILTER_REJECT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeFilterFILTER_REJECT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsNodeFilterFILTER_SKIP(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeFilterFILTER_SKIP(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsNodeFilterSHOW_ALL(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeFilterSHOW_ALL(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0xFFFFFFFF)); } -JSValuePtr jsNodeFilterSHOW_ELEMENT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeFilterSHOW_ELEMENT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x00000001)); } -JSValuePtr jsNodeFilterSHOW_ATTRIBUTE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeFilterSHOW_ATTRIBUTE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x00000002)); } -JSValuePtr jsNodeFilterSHOW_TEXT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeFilterSHOW_TEXT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x00000004)); } -JSValuePtr jsNodeFilterSHOW_CDATA_SECTION(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeFilterSHOW_CDATA_SECTION(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x00000008)); } -JSValuePtr jsNodeFilterSHOW_ENTITY_REFERENCE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeFilterSHOW_ENTITY_REFERENCE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x00000010)); } -JSValuePtr jsNodeFilterSHOW_ENTITY(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeFilterSHOW_ENTITY(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x00000020)); } -JSValuePtr jsNodeFilterSHOW_PROCESSING_INSTRUCTION(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeFilterSHOW_PROCESSING_INSTRUCTION(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x00000040)); } -JSValuePtr jsNodeFilterSHOW_COMMENT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeFilterSHOW_COMMENT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x00000080)); } -JSValuePtr jsNodeFilterSHOW_DOCUMENT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeFilterSHOW_DOCUMENT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x00000100)); } -JSValuePtr jsNodeFilterSHOW_DOCUMENT_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeFilterSHOW_DOCUMENT_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x00000200)); } -JSValuePtr jsNodeFilterSHOW_DOCUMENT_FRAGMENT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeFilterSHOW_DOCUMENT_FRAGMENT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x00000400)); } -JSValuePtr jsNodeFilterSHOW_NOTATION(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsNodeFilterSHOW_NOTATION(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0x00000800)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, NodeFilter* object) +JSC::JSValue toJS(JSC::ExecState* exec, NodeFilter* object) { return getDOMObjectWrapper<JSNodeFilter>(exec, object); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSNodeFilter.h b/src/3rdparty/webkit/WebCore/generated/JSNodeFilter.h index 480d78c208..0fd1b42901 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNodeFilter.h +++ b/src/3rdparty/webkit/WebCore/generated/JSNodeFilter.h @@ -34,38 +34,39 @@ class JSNodeFilter : public DOMObject { public: JSNodeFilter(PassRefPtr<JSC::Structure>, PassRefPtr<NodeFilter>); virtual ~JSNodeFilter(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void mark(); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom functions - JSC::JSValuePtr acceptNode(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue acceptNode(JSC::ExecState*, const JSC::ArgList&); NodeFilter* impl() const { return m_impl.get(); } private: RefPtr<NodeFilter> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, NodeFilter*); -PassRefPtr<NodeFilter> toNodeFilter(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, NodeFilter*); +PassRefPtr<NodeFilter> toNodeFilter(JSC::JSValue); class JSNodeFilterPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -74,28 +75,28 @@ public: // Functions -JSC::JSValuePtr jsNodeFilterPrototypeFunctionAcceptNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodeFilterPrototypeFunctionAcceptNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsNodeFilterConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsNodeFilterFILTER_ACCEPT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeFilterFILTER_REJECT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeFilterFILTER_SKIP(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeFilterSHOW_ALL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeFilterSHOW_ELEMENT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeFilterSHOW_ATTRIBUTE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeFilterSHOW_TEXT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeFilterSHOW_CDATA_SECTION(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeFilterSHOW_ENTITY_REFERENCE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeFilterSHOW_ENTITY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeFilterSHOW_PROCESSING_INSTRUCTION(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeFilterSHOW_COMMENT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeFilterSHOW_DOCUMENT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeFilterSHOW_DOCUMENT_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeFilterSHOW_DOCUMENT_FRAGMENT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeFilterSHOW_NOTATION(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterFILTER_ACCEPT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterFILTER_REJECT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterFILTER_SKIP(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterSHOW_ALL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterSHOW_ELEMENT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterSHOW_ATTRIBUTE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterSHOW_TEXT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterSHOW_CDATA_SECTION(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterSHOW_ENTITY_REFERENCE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterSHOW_ENTITY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterSHOW_PROCESSING_INSTRUCTION(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterSHOW_COMMENT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterSHOW_DOCUMENT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterSHOW_DOCUMENT_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterSHOW_DOCUMENT_FRAGMENT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeFilterSHOW_NOTATION(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSNodeIterator.cpp b/src/3rdparty/webkit/WebCore/generated/JSNodeIterator.cpp index 450a4102e3..6fe8cc2f95 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNodeIterator.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSNodeIterator.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSNodeIterator) +ASSERT_CLASS_FITS_IN_CELL(JSNodeIterator); /* Hash table */ @@ -79,13 +79,13 @@ public: JSNodeIteratorConstructor(ExecState* exec) : DOMObject(JSNodeIteratorConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSNodeIteratorPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSNodeIteratorPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -117,9 +117,9 @@ static const HashTable JSNodeIteratorPrototypeTable = const ClassInfo JSNodeIteratorPrototype::s_info = { "NodeIteratorPrototype", 0, &JSNodeIteratorPrototypeTable, 0 }; -JSObject* JSNodeIteratorPrototype::self(ExecState* exec) +JSObject* JSNodeIteratorPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSNodeIterator>(exec); + return getDOMPrototype<JSNodeIterator>(exec, globalObject); } bool JSNodeIteratorPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -138,12 +138,11 @@ JSNodeIterator::JSNodeIterator(PassRefPtr<Structure> structure, PassRefPtr<NodeI JSNodeIterator::~JSNodeIterator() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSNodeIterator::createPrototype(ExecState* exec) +JSObject* JSNodeIterator::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSNodeIteratorPrototype(JSNodeIteratorPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSNodeIteratorPrototype(JSNodeIteratorPrototype::createStructure(globalObject->objectPrototype())); } bool JSNodeIterator::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -151,70 +150,79 @@ bool JSNodeIterator::getOwnPropertySlot(ExecState* exec, const Identifier& prope return getStaticValueSlot<JSNodeIterator, Base>(exec, &JSNodeIteratorTable, this, propertyName, slot); } -JSValuePtr jsNodeIteratorRoot(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeIteratorRoot(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); NodeIterator* imp = static_cast<NodeIterator*>(static_cast<JSNodeIterator*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->root())); } -JSValuePtr jsNodeIteratorWhatToShow(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeIteratorWhatToShow(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); NodeIterator* imp = static_cast<NodeIterator*>(static_cast<JSNodeIterator*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->whatToShow()); } -JSValuePtr jsNodeIteratorFilter(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeIteratorFilter(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); NodeIterator* imp = static_cast<NodeIterator*>(static_cast<JSNodeIterator*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->filter())); } -JSValuePtr jsNodeIteratorExpandEntityReferences(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeIteratorExpandEntityReferences(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); NodeIterator* imp = static_cast<NodeIterator*>(static_cast<JSNodeIterator*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->expandEntityReferences()); } -JSValuePtr jsNodeIteratorReferenceNode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeIteratorReferenceNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); NodeIterator* imp = static_cast<NodeIterator*>(static_cast<JSNodeIterator*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->referenceNode())); } -JSValuePtr jsNodeIteratorPointerBeforeReferenceNode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeIteratorPointerBeforeReferenceNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); NodeIterator* imp = static_cast<NodeIterator*>(static_cast<JSNodeIterator*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->pointerBeforeReferenceNode()); } -JSValuePtr jsNodeIteratorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeIteratorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSNodeIterator*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSNodeIterator::getConstructor(ExecState* exec) +JSValue JSNodeIterator::getConstructor(ExecState* exec) { return getDOMConstructor<JSNodeIteratorConstructor>(exec); } -JSValuePtr jsNodeIteratorPrototypeFunctionNextNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodeIteratorPrototypeFunctionNextNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNodeIterator::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNodeIterator::s_info)) return throwError(exec, TypeError); JSNodeIterator* castedThisObj = static_cast<JSNodeIterator*>(asObject(thisValue)); return castedThisObj->nextNode(exec, args); } -JSValuePtr jsNodeIteratorPrototypeFunctionPreviousNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodeIteratorPrototypeFunctionPreviousNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNodeIterator::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNodeIterator::s_info)) return throwError(exec, TypeError); JSNodeIterator* castedThisObj = static_cast<JSNodeIterator*>(asObject(thisValue)); return castedThisObj->previousNode(exec, args); } -JSValuePtr jsNodeIteratorPrototypeFunctionDetach(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodeIteratorPrototypeFunctionDetach(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNodeIterator::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNodeIterator::s_info)) return throwError(exec, TypeError); JSNodeIterator* castedThisObj = static_cast<JSNodeIterator*>(asObject(thisValue)); NodeIterator* imp = static_cast<NodeIterator*>(castedThisObj->impl()); @@ -223,13 +231,13 @@ JSValuePtr jsNodeIteratorPrototypeFunctionDetach(ExecState* exec, JSObject*, JSV return jsUndefined(); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, NodeIterator* object) +JSC::JSValue toJS(JSC::ExecState* exec, NodeIterator* object) { return getDOMObjectWrapper<JSNodeIterator>(exec, object); } -NodeIterator* toNodeIterator(JSC::JSValuePtr value) +NodeIterator* toNodeIterator(JSC::JSValue value) { - return value->isObject(&JSNodeIterator::s_info) ? static_cast<JSNodeIterator*>(asObject(value))->impl() : 0; + return value.isObject(&JSNodeIterator::s_info) ? static_cast<JSNodeIterator*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSNodeIterator.h b/src/3rdparty/webkit/WebCore/generated/JSNodeIterator.h index db97842ee2..ab5e7c670a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNodeIterator.h +++ b/src/3rdparty/webkit/WebCore/generated/JSNodeIterator.h @@ -34,39 +34,40 @@ class JSNodeIterator : public DOMObject { public: JSNodeIterator(PassRefPtr<JSC::Structure>, PassRefPtr<NodeIterator>); virtual ~JSNodeIterator(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void mark(); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom functions - JSC::JSValuePtr nextNode(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr previousNode(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue nextNode(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue previousNode(JSC::ExecState*, const JSC::ArgList&); NodeIterator* impl() const { return m_impl.get(); } private: RefPtr<NodeIterator> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, NodeIterator*); -NodeIterator* toNodeIterator(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, NodeIterator*); +NodeIterator* toNodeIterator(JSC::JSValue); class JSNodeIteratorPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -75,18 +76,18 @@ public: // Functions -JSC::JSValuePtr jsNodeIteratorPrototypeFunctionNextNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNodeIteratorPrototypeFunctionPreviousNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsNodeIteratorPrototypeFunctionDetach(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodeIteratorPrototypeFunctionNextNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodeIteratorPrototypeFunctionPreviousNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodeIteratorPrototypeFunctionDetach(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsNodeIteratorRoot(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeIteratorWhatToShow(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeIteratorFilter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeIteratorExpandEntityReferences(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeIteratorReferenceNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeIteratorPointerBeforeReferenceNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeIteratorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeIteratorRoot(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeIteratorWhatToShow(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeIteratorFilter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeIteratorExpandEntityReferences(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeIteratorReferenceNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeIteratorPointerBeforeReferenceNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeIteratorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSNodeList.cpp b/src/3rdparty/webkit/WebCore/generated/JSNodeList.cpp index 7e264274ce..b7fa2c5e08 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNodeList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSNodeList.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSNodeList) +ASSERT_CLASS_FITS_IN_CELL(JSNodeList); /* Hash table */ @@ -75,13 +75,13 @@ public: JSNodeListConstructor(ExecState* exec) : DOMObject(JSNodeListConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSNodeListPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSNodeListPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -111,9 +111,9 @@ static const HashTable JSNodeListPrototypeTable = const ClassInfo JSNodeListPrototype::s_info = { "NodeListPrototype", 0, &JSNodeListPrototypeTable, 0 }; -JSObject* JSNodeListPrototype::self(ExecState* exec) +JSObject* JSNodeListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSNodeList>(exec); + return getDOMPrototype<JSNodeList>(exec, globalObject); } bool JSNodeListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -132,12 +132,11 @@ JSNodeList::JSNodeList(PassRefPtr<Structure> structure, PassRefPtr<NodeList> imp JSNodeList::~JSNodeList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSNodeList::createPrototype(ExecState* exec) +JSObject* JSNodeList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSNodeListPrototype(JSNodeListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSNodeListPrototype(JSNodeListPrototype::createStructure(globalObject->objectPrototype())); } bool JSNodeList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -169,13 +168,14 @@ bool JSNodeList::getOwnPropertySlot(ExecState* exec, unsigned propertyName, Prop return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -JSValuePtr jsNodeListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); NodeList* imp = static_cast<NodeList*>(static_cast<JSNodeList*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsNodeListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNodeListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSNodeList*>(asObject(slot.slotBase()))->getConstructor(exec); } @@ -186,41 +186,42 @@ void JSNodeList::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNa Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSNodeList::getConstructor(ExecState* exec) +JSValue JSNodeList::getConstructor(ExecState* exec) { return getDOMConstructor<JSNodeListConstructor>(exec); } -JSValuePtr jsNodeListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsNodeListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSNodeList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSNodeList::s_info)) return throwError(exec, TypeError); JSNodeList* castedThisObj = static_cast<JSNodeList*>(asObject(thisValue)); NodeList* imp = static_cast<NodeList*>(castedThisObj->impl()); - int index = args.at(exec, 0)->toInt32(exec); + int index = args.at(0).toInt32(exec); if (index < 0) { setDOMException(exec, INDEX_SIZE_ERR); return jsUndefined(); } - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); return result; } -JSValuePtr JSNodeList::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue JSNodeList::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSNodeList* thisObj = static_cast<JSNodeList*>(asObject(slot.slotBase())); return toJS(exec, static_cast<NodeList*>(thisObj->impl())->item(slot.index())); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, NodeList* object) +JSC::JSValue toJS(JSC::ExecState* exec, NodeList* object) { return getDOMObjectWrapper<JSNodeList>(exec, object); } -NodeList* toNodeList(JSC::JSValuePtr value) +NodeList* toNodeList(JSC::JSValue value) { - return value->isObject(&JSNodeList::s_info) ? static_cast<JSNodeList*>(asObject(value))->impl() : 0; + return value.isObject(&JSNodeList::s_info) ? static_cast<JSNodeList*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSNodeList.h b/src/3rdparty/webkit/WebCore/generated/JSNodeList.h index 2297c77870..2a64c59707 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNodeList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSNodeList.h @@ -35,13 +35,13 @@ class JSNodeList : public DOMObject { public: JSNodeList(PassRefPtr<JSC::Structure>, PassRefPtr<NodeList>); virtual ~JSNodeList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,27 +49,28 @@ public: virtual JSC::CallType getCallData(JSC::CallData&); virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); NodeList* impl() const { return m_impl.get(); } private: RefPtr<NodeList> m_impl; - static JSC::JSValuePtr indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); private: static bool canGetItemsForName(JSC::ExecState*, NodeList*, const JSC::Identifier&); - static JSC::JSValuePtr nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValuePtr toJS(JSC::ExecState*, NodeList*); -NodeList* toNodeList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, NodeList*); +NodeList* toNodeList(JSC::JSValue); class JSNodeListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -78,11 +79,11 @@ public: // Functions -JSC::JSValuePtr jsNodeListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsNodeListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsNodeListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNodeListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNodeListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSNotation.cpp b/src/3rdparty/webkit/WebCore/generated/JSNotation.cpp index 67eed7b167..5187c8fbbd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNotation.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSNotation.cpp @@ -33,7 +33,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSNotation) +ASSERT_CLASS_FITS_IN_CELL(JSNotation); /* Hash table */ @@ -71,13 +71,13 @@ public: JSNotationConstructor(ExecState* exec) : DOMObject(JSNotationConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSNotationPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSNotationPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -106,9 +106,9 @@ static const HashTable JSNotationPrototypeTable = const ClassInfo JSNotationPrototype::s_info = { "NotationPrototype", 0, &JSNotationPrototypeTable, 0 }; -JSObject* JSNotationPrototype::self(ExecState* exec) +JSObject* JSNotationPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSNotation>(exec); + return getDOMPrototype<JSNotation>(exec, globalObject); } const ClassInfo JSNotation::s_info = { "Notation", &JSNode::s_info, &JSNotationTable, 0 }; @@ -118,9 +118,9 @@ JSNotation::JSNotation(PassRefPtr<Structure> structure, PassRefPtr<Notation> imp { } -JSObject* JSNotation::createPrototype(ExecState* exec) +JSObject* JSNotation::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSNotationPrototype(JSNotationPrototype::createStructure(JSNodePrototype::self(exec))); + return new (exec) JSNotationPrototype(JSNotationPrototype::createStructure(JSNodePrototype::self(exec, globalObject))); } bool JSNotation::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,23 +128,25 @@ bool JSNotation::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN return getStaticValueSlot<JSNotation, Base>(exec, &JSNotationTable, this, propertyName, slot); } -JSValuePtr jsNotationPublicId(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNotationPublicId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Notation* imp = static_cast<Notation*>(static_cast<JSNotation*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->publicId()); } -JSValuePtr jsNotationSystemId(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNotationSystemId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Notation* imp = static_cast<Notation*>(static_cast<JSNotation*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->systemId()); } -JSValuePtr jsNotationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsNotationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSNotation*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSNotation::getConstructor(ExecState* exec) +JSValue JSNotation::getConstructor(ExecState* exec) { return getDOMConstructor<JSNotationConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSNotation.h b/src/3rdparty/webkit/WebCore/generated/JSNotation.h index 698a03ad7f..00d3427893 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNotation.h +++ b/src/3rdparty/webkit/WebCore/generated/JSNotation.h @@ -31,23 +31,24 @@ class JSNotation : public JSNode { typedef JSNode Base; public: JSNotation(PassRefPtr<JSC::Structure>, PassRefPtr<Notation>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSNotationPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSNotationPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -55,9 +56,9 @@ public: // Attributes -JSC::JSValuePtr jsNotationPublicId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNotationSystemId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsNotationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNotationPublicId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNotationSystemId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsNotationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSOverflowEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSOverflowEvent.cpp index fae420f2dd..0ae7a26bb9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSOverflowEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSOverflowEvent.cpp @@ -33,7 +33,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSOverflowEvent) +ASSERT_CLASS_FITS_IN_CELL(JSOverflowEvent); /* Hash table */ @@ -75,13 +75,13 @@ public: JSOverflowEventConstructor(ExecState* exec) : DOMObject(JSOverflowEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSOverflowEventPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSOverflowEventPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -114,9 +114,9 @@ static const HashTable JSOverflowEventPrototypeTable = const ClassInfo JSOverflowEventPrototype::s_info = { "OverflowEventPrototype", 0, &JSOverflowEventPrototypeTable, 0 }; -JSObject* JSOverflowEventPrototype::self(ExecState* exec) +JSObject* JSOverflowEventPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSOverflowEvent>(exec); + return getDOMPrototype<JSOverflowEvent>(exec, globalObject); } bool JSOverflowEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -131,9 +131,9 @@ JSOverflowEvent::JSOverflowEvent(PassRefPtr<Structure> structure, PassRefPtr<Ove { } -JSObject* JSOverflowEvent::createPrototype(ExecState* exec) +JSObject* JSOverflowEvent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSOverflowEventPrototype(JSOverflowEventPrototype::createStructure(JSEventPrototype::self(exec))); + return new (exec) JSOverflowEventPrototype(JSOverflowEventPrototype::createStructure(JSEventPrototype::self(exec, globalObject))); } bool JSOverflowEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -141,42 +141,46 @@ bool JSOverflowEvent::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSOverflowEvent, Base>(exec, &JSOverflowEventTable, this, propertyName, slot); } -JSValuePtr jsOverflowEventOrient(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsOverflowEventOrient(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); OverflowEvent* imp = static_cast<OverflowEvent*>(static_cast<JSOverflowEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->orient()); } -JSValuePtr jsOverflowEventHorizontalOverflow(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsOverflowEventHorizontalOverflow(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); OverflowEvent* imp = static_cast<OverflowEvent*>(static_cast<JSOverflowEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->horizontalOverflow()); } -JSValuePtr jsOverflowEventVerticalOverflow(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsOverflowEventVerticalOverflow(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); OverflowEvent* imp = static_cast<OverflowEvent*>(static_cast<JSOverflowEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->verticalOverflow()); } -JSValuePtr jsOverflowEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsOverflowEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSOverflowEvent*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSOverflowEvent::getConstructor(ExecState* exec) +JSValue JSOverflowEvent::getConstructor(ExecState* exec) { return getDOMConstructor<JSOverflowEventConstructor>(exec); } -JSValuePtr jsOverflowEventPrototypeFunctionInitOverflowEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsOverflowEventPrototypeFunctionInitOverflowEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSOverflowEvent::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSOverflowEvent::s_info)) return throwError(exec, TypeError); JSOverflowEvent* castedThisObj = static_cast<JSOverflowEvent*>(asObject(thisValue)); OverflowEvent* imp = static_cast<OverflowEvent*>(castedThisObj->impl()); - unsigned short orient = args.at(exec, 0)->toInt32(exec); - bool horizontalOverflow = args.at(exec, 1)->toBoolean(exec); - bool verticalOverflow = args.at(exec, 2)->toBoolean(exec); + unsigned short orient = args.at(0).toInt32(exec); + bool horizontalOverflow = args.at(1).toBoolean(exec); + bool verticalOverflow = args.at(2).toBoolean(exec); imp->initOverflowEvent(orient, horizontalOverflow, verticalOverflow); return jsUndefined(); @@ -184,17 +188,17 @@ JSValuePtr jsOverflowEventPrototypeFunctionInitOverflowEvent(ExecState* exec, JS // Constant getters -JSValuePtr jsOverflowEventHORIZONTAL(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsOverflowEventHORIZONTAL(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsOverflowEventVERTICAL(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsOverflowEventVERTICAL(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsOverflowEventBOTH(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsOverflowEventBOTH(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSOverflowEvent.h b/src/3rdparty/webkit/WebCore/generated/JSOverflowEvent.h index afa8ea0d8c..b018a86cbc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSOverflowEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSOverflowEvent.h @@ -31,27 +31,28 @@ class JSOverflowEvent : public JSEvent { typedef JSEvent Base; public: JSOverflowEvent(PassRefPtr<JSC::Structure>, PassRefPtr<OverflowEvent>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSOverflowEventPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,18 +61,18 @@ public: // Functions -JSC::JSValuePtr jsOverflowEventPrototypeFunctionInitOverflowEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsOverflowEventPrototypeFunctionInitOverflowEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsOverflowEventOrient(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsOverflowEventHorizontalOverflow(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsOverflowEventVerticalOverflow(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsOverflowEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsOverflowEventOrient(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsOverflowEventHorizontalOverflow(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsOverflowEventVerticalOverflow(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsOverflowEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsOverflowEventHORIZONTAL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsOverflowEventVERTICAL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsOverflowEventBOTH(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsOverflowEventHORIZONTAL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsOverflowEventVERTICAL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsOverflowEventBOTH(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSPlugin.cpp b/src/3rdparty/webkit/WebCore/generated/JSPlugin.cpp index ec3bc6ddf9..04f24fe152 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSPlugin.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSPlugin.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSPlugin) +ASSERT_CLASS_FITS_IN_CELL(JSPlugin); /* Hash table */ @@ -79,13 +79,13 @@ public: JSPluginConstructor(ExecState* exec) : DOMObject(JSPluginConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSPluginPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSPluginPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -116,9 +116,9 @@ static const HashTable JSPluginPrototypeTable = const ClassInfo JSPluginPrototype::s_info = { "PluginPrototype", 0, &JSPluginPrototypeTable, 0 }; -JSObject* JSPluginPrototype::self(ExecState* exec) +JSObject* JSPluginPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSPlugin>(exec); + return getDOMPrototype<JSPlugin>(exec, globalObject); } bool JSPluginPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -137,12 +137,11 @@ JSPlugin::JSPlugin(PassRefPtr<Structure> structure, PassRefPtr<Plugin> impl) JSPlugin::~JSPlugin() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSPlugin::createPrototype(ExecState* exec) +JSObject* JSPlugin::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSPluginPrototype(JSPluginPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSPluginPrototype(JSPluginPrototype::createStructure(globalObject->objectPrototype())); } bool JSPlugin::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -174,31 +173,35 @@ bool JSPlugin::getOwnPropertySlot(ExecState* exec, unsigned propertyName, Proper return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -JSValuePtr jsPluginName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsPluginName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Plugin* imp = static_cast<Plugin*>(static_cast<JSPlugin*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsPluginFilename(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsPluginFilename(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Plugin* imp = static_cast<Plugin*>(static_cast<JSPlugin*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->filename()); } -JSValuePtr jsPluginDescription(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsPluginDescription(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Plugin* imp = static_cast<Plugin*>(static_cast<JSPlugin*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->description()); } -JSValuePtr jsPluginLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsPluginLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Plugin* imp = static_cast<Plugin*>(static_cast<JSPlugin*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsPluginConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsPluginConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSPlugin*>(asObject(slot.slotBase()))->getConstructor(exec); } @@ -209,50 +212,52 @@ void JSPlugin::getPropertyNames(ExecState* exec, PropertyNameArray& propertyName Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSPlugin::getConstructor(ExecState* exec) +JSValue JSPlugin::getConstructor(ExecState* exec) { return getDOMConstructor<JSPluginConstructor>(exec); } -JSValuePtr jsPluginPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsPluginPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSPlugin::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSPlugin::s_info)) return throwError(exec, TypeError); JSPlugin* castedThisObj = static_cast<JSPlugin*>(asObject(thisValue)); Plugin* imp = static_cast<Plugin*>(castedThisObj->impl()); - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); return result; } -JSValuePtr jsPluginPrototypeFunctionNamedItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsPluginPrototypeFunctionNamedItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSPlugin::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSPlugin::s_info)) return throwError(exec, TypeError); JSPlugin* castedThisObj = static_cast<JSPlugin*>(asObject(thisValue)); Plugin* imp = static_cast<Plugin*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->namedItem(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->namedItem(name))); return result; } -JSValuePtr JSPlugin::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue JSPlugin::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSPlugin* thisObj = static_cast<JSPlugin*>(asObject(slot.slotBase())); return toJS(exec, static_cast<Plugin*>(thisObj->impl())->item(slot.index())); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, Plugin* object) +JSC::JSValue toJS(JSC::ExecState* exec, Plugin* object) { return getDOMObjectWrapper<JSPlugin>(exec, object); } -Plugin* toPlugin(JSC::JSValuePtr value) +Plugin* toPlugin(JSC::JSValue value) { - return value->isObject(&JSPlugin::s_info) ? static_cast<JSPlugin*>(asObject(value))->impl() : 0; + return value.isObject(&JSPlugin::s_info) ? static_cast<JSPlugin*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSPlugin.h b/src/3rdparty/webkit/WebCore/generated/JSPlugin.h index adf03a36f8..7ff040fd94 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSPlugin.h +++ b/src/3rdparty/webkit/WebCore/generated/JSPlugin.h @@ -34,39 +34,40 @@ class JSPlugin : public DOMObject { public: JSPlugin(PassRefPtr<JSC::Structure>, PassRefPtr<Plugin>); virtual ~JSPlugin(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); Plugin* impl() const { return m_impl.get(); } private: RefPtr<Plugin> m_impl; - static JSC::JSValuePtr indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); private: static bool canGetItemsForName(JSC::ExecState*, Plugin*, const JSC::Identifier&); - static JSC::JSValuePtr nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValuePtr toJS(JSC::ExecState*, Plugin*); -Plugin* toPlugin(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, Plugin*); +Plugin* toPlugin(JSC::JSValue); class JSPluginPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -75,15 +76,15 @@ public: // Functions -JSC::JSValuePtr jsPluginPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsPluginPrototypeFunctionNamedItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsPluginPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsPluginPrototypeFunctionNamedItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsPluginName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsPluginFilename(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsPluginDescription(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsPluginLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsPluginConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsPluginName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsPluginFilename(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsPluginDescription(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsPluginLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsPluginConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSPluginArray.cpp b/src/3rdparty/webkit/WebCore/generated/JSPluginArray.cpp index 99a635c798..26b5515564 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSPluginArray.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSPluginArray.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSPluginArray) +ASSERT_CLASS_FITS_IN_CELL(JSPluginArray); /* Hash table */ @@ -74,13 +74,13 @@ public: JSPluginArrayConstructor(ExecState* exec) : DOMObject(JSPluginArrayConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSPluginArrayPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSPluginArrayPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -112,9 +112,9 @@ static const HashTable JSPluginArrayPrototypeTable = const ClassInfo JSPluginArrayPrototype::s_info = { "PluginArrayPrototype", 0, &JSPluginArrayPrototypeTable, 0 }; -JSObject* JSPluginArrayPrototype::self(ExecState* exec) +JSObject* JSPluginArrayPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSPluginArray>(exec); + return getDOMPrototype<JSPluginArray>(exec, globalObject); } bool JSPluginArrayPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -133,12 +133,11 @@ JSPluginArray::JSPluginArray(PassRefPtr<Structure> structure, PassRefPtr<PluginA JSPluginArray::~JSPluginArray() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSPluginArray::createPrototype(ExecState* exec) +JSObject* JSPluginArray::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSPluginArrayPrototype(JSPluginArrayPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSPluginArrayPrototype(JSPluginArrayPrototype::createStructure(globalObject->objectPrototype())); } bool JSPluginArray::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -170,13 +169,14 @@ bool JSPluginArray::getOwnPropertySlot(ExecState* exec, unsigned propertyName, P return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -JSValuePtr jsPluginArrayLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsPluginArrayLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); PluginArray* imp = static_cast<PluginArray*>(static_cast<JSPluginArray*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsPluginArrayConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsPluginArrayConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSPluginArray*>(asObject(slot.slotBase()))->getConstructor(exec); } @@ -187,62 +187,65 @@ void JSPluginArray::getPropertyNames(ExecState* exec, PropertyNameArray& propert Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSPluginArray::getConstructor(ExecState* exec) +JSValue JSPluginArray::getConstructor(ExecState* exec) { return getDOMConstructor<JSPluginArrayConstructor>(exec); } -JSValuePtr jsPluginArrayPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsPluginArrayPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSPluginArray::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSPluginArray::s_info)) return throwError(exec, TypeError); JSPluginArray* castedThisObj = static_cast<JSPluginArray*>(asObject(thisValue)); PluginArray* imp = static_cast<PluginArray*>(castedThisObj->impl()); - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); return result; } -JSValuePtr jsPluginArrayPrototypeFunctionNamedItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsPluginArrayPrototypeFunctionNamedItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSPluginArray::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSPluginArray::s_info)) return throwError(exec, TypeError); JSPluginArray* castedThisObj = static_cast<JSPluginArray*>(asObject(thisValue)); PluginArray* imp = static_cast<PluginArray*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->namedItem(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->namedItem(name))); return result; } -JSValuePtr jsPluginArrayPrototypeFunctionRefresh(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsPluginArrayPrototypeFunctionRefresh(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSPluginArray::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSPluginArray::s_info)) return throwError(exec, TypeError); JSPluginArray* castedThisObj = static_cast<JSPluginArray*>(asObject(thisValue)); PluginArray* imp = static_cast<PluginArray*>(castedThisObj->impl()); - bool reload = args.at(exec, 0)->toBoolean(exec); + bool reload = args.at(0).toBoolean(exec); imp->refresh(reload); return jsUndefined(); } -JSValuePtr JSPluginArray::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue JSPluginArray::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSPluginArray* thisObj = static_cast<JSPluginArray*>(asObject(slot.slotBase())); return toJS(exec, static_cast<PluginArray*>(thisObj->impl())->item(slot.index())); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, PluginArray* object) +JSC::JSValue toJS(JSC::ExecState* exec, PluginArray* object) { return getDOMObjectWrapper<JSPluginArray>(exec, object); } -PluginArray* toPluginArray(JSC::JSValuePtr value) +PluginArray* toPluginArray(JSC::JSValue value) { - return value->isObject(&JSPluginArray::s_info) ? static_cast<JSPluginArray*>(asObject(value))->impl() : 0; + return value.isObject(&JSPluginArray::s_info) ? static_cast<JSPluginArray*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSPluginArray.h b/src/3rdparty/webkit/WebCore/generated/JSPluginArray.h index b66b7cd16d..56bb33e68e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSPluginArray.h +++ b/src/3rdparty/webkit/WebCore/generated/JSPluginArray.h @@ -34,39 +34,40 @@ class JSPluginArray : public DOMObject { public: JSPluginArray(PassRefPtr<JSC::Structure>, PassRefPtr<PluginArray>); virtual ~JSPluginArray(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); PluginArray* impl() const { return m_impl.get(); } private: RefPtr<PluginArray> m_impl; - static JSC::JSValuePtr indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); private: static bool canGetItemsForName(JSC::ExecState*, PluginArray*, const JSC::Identifier&); - static JSC::JSValuePtr nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValuePtr toJS(JSC::ExecState*, PluginArray*); -PluginArray* toPluginArray(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, PluginArray*); +PluginArray* toPluginArray(JSC::JSValue); class JSPluginArrayPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -75,13 +76,13 @@ public: // Functions -JSC::JSValuePtr jsPluginArrayPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsPluginArrayPrototypeFunctionNamedItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsPluginArrayPrototypeFunctionRefresh(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsPluginArrayPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsPluginArrayPrototypeFunctionNamedItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsPluginArrayPrototypeFunctionRefresh(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsPluginArrayLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsPluginArrayConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsPluginArrayLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsPluginArrayConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSPositionError.cpp b/src/3rdparty/webkit/WebCore/generated/JSPositionError.cpp index 5e0374d080..7c4896fd96 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSPositionError.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSPositionError.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSPositionError) +ASSERT_CLASS_FITS_IN_CELL(JSPositionError); /* Hash table */ @@ -76,13 +76,13 @@ public: JSPositionErrorConstructor(ExecState* exec) : DOMObject(JSPositionErrorConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSPositionErrorPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSPositionErrorPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -115,9 +115,9 @@ static const HashTable JSPositionErrorPrototypeTable = const ClassInfo JSPositionErrorPrototype::s_info = { "PositionErrorPrototype", 0, &JSPositionErrorPrototypeTable, 0 }; -JSObject* JSPositionErrorPrototype::self(ExecState* exec) +JSObject* JSPositionErrorPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSPositionError>(exec); + return getDOMPrototype<JSPositionError>(exec, globalObject); } bool JSPositionErrorPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -136,12 +136,11 @@ JSPositionError::JSPositionError(PassRefPtr<Structure> structure, PassRefPtr<Pos JSPositionError::~JSPositionError() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSPositionError::createPrototype(ExecState* exec) +JSObject* JSPositionError::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSPositionErrorPrototype(JSPositionErrorPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSPositionErrorPrototype(JSPositionErrorPrototype::createStructure(globalObject->objectPrototype())); } bool JSPositionError::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -149,56 +148,58 @@ bool JSPositionError::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSPositionError, Base>(exec, &JSPositionErrorTable, this, propertyName, slot); } -JSValuePtr jsPositionErrorCode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsPositionErrorCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); PositionError* imp = static_cast<PositionError*>(static_cast<JSPositionError*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->code()); } -JSValuePtr jsPositionErrorMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsPositionErrorMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); PositionError* imp = static_cast<PositionError*>(static_cast<JSPositionError*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->message()); } -JSValuePtr jsPositionErrorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsPositionErrorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSPositionError*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSPositionError::getConstructor(ExecState* exec) +JSValue JSPositionError::getConstructor(ExecState* exec) { return getDOMConstructor<JSPositionErrorConstructor>(exec); } // Constant getters -JSValuePtr jsPositionErrorUNKNOWN_ERROR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsPositionErrorUNKNOWN_ERROR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsPositionErrorPERMISSION_DENIED(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsPositionErrorPERMISSION_DENIED(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsPositionErrorPOSITION_UNAVAILABLE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsPositionErrorPOSITION_UNAVAILABLE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsPositionErrorTIMEOUT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsPositionErrorTIMEOUT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, PositionError* object) +JSC::JSValue toJS(JSC::ExecState* exec, PositionError* object) { return getDOMObjectWrapper<JSPositionError>(exec, object); } -PositionError* toPositionError(JSC::JSValuePtr value) +PositionError* toPositionError(JSC::JSValue value) { - return value->isObject(&JSPositionError::s_info) ? static_cast<JSPositionError*>(asObject(value))->impl() : 0; + return value.isObject(&JSPositionError::s_info) ? static_cast<JSPositionError*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSPositionError.h b/src/3rdparty/webkit/WebCore/generated/JSPositionError.h index d8cc4c152a..9f256f4499 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSPositionError.h +++ b/src/3rdparty/webkit/WebCore/generated/JSPositionError.h @@ -34,33 +34,34 @@ class JSPositionError : public DOMObject { public: JSPositionError(PassRefPtr<JSC::Structure>, PassRefPtr<PositionError>); virtual ~JSPositionError(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); PositionError* impl() const { return m_impl.get(); } private: RefPtr<PositionError> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, PositionError*); -PositionError* toPositionError(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, PositionError*); +PositionError* toPositionError(JSC::JSValue); class JSPositionErrorPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -69,15 +70,15 @@ public: // Attributes -JSC::JSValuePtr jsPositionErrorCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsPositionErrorMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsPositionErrorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsPositionErrorCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsPositionErrorMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsPositionErrorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsPositionErrorUNKNOWN_ERROR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsPositionErrorPERMISSION_DENIED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsPositionErrorPOSITION_UNAVAILABLE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsPositionErrorTIMEOUT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsPositionErrorUNKNOWN_ERROR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsPositionErrorPERMISSION_DENIED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsPositionErrorPOSITION_UNAVAILABLE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsPositionErrorTIMEOUT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSProcessingInstruction.cpp b/src/3rdparty/webkit/WebCore/generated/JSProcessingInstruction.cpp index 567cf03629..56f9b61921 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSProcessingInstruction.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSProcessingInstruction.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSProcessingInstruction) +ASSERT_CLASS_FITS_IN_CELL(JSProcessingInstruction); /* Hash table */ @@ -74,13 +74,13 @@ public: JSProcessingInstructionConstructor(ExecState* exec) : DOMObject(JSProcessingInstructionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSProcessingInstructionPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSProcessingInstructionPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -109,9 +109,9 @@ static const HashTable JSProcessingInstructionPrototypeTable = const ClassInfo JSProcessingInstructionPrototype::s_info = { "ProcessingInstructionPrototype", 0, &JSProcessingInstructionPrototypeTable, 0 }; -JSObject* JSProcessingInstructionPrototype::self(ExecState* exec) +JSObject* JSProcessingInstructionPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSProcessingInstruction>(exec); + return getDOMPrototype<JSProcessingInstruction>(exec, globalObject); } const ClassInfo JSProcessingInstruction::s_info = { "ProcessingInstruction", &JSNode::s_info, &JSProcessingInstructionTable, 0 }; @@ -121,9 +121,9 @@ JSProcessingInstruction::JSProcessingInstruction(PassRefPtr<Structure> structure { } -JSObject* JSProcessingInstruction::createPrototype(ExecState* exec) +JSObject* JSProcessingInstruction::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSProcessingInstructionPrototype(JSProcessingInstructionPrototype::createStructure(JSNodePrototype::self(exec))); + return new (exec) JSProcessingInstructionPrototype(JSProcessingInstructionPrototype::createStructure(JSNodePrototype::self(exec, globalObject))); } bool JSProcessingInstruction::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -131,34 +131,37 @@ bool JSProcessingInstruction::getOwnPropertySlot(ExecState* exec, const Identifi return getStaticValueSlot<JSProcessingInstruction, Base>(exec, &JSProcessingInstructionTable, this, propertyName, slot); } -JSValuePtr jsProcessingInstructionTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsProcessingInstructionTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); ProcessingInstruction* imp = static_cast<ProcessingInstruction*>(static_cast<JSProcessingInstruction*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->target()); } -JSValuePtr jsProcessingInstructionData(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsProcessingInstructionData(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); ProcessingInstruction* imp = static_cast<ProcessingInstruction*>(static_cast<JSProcessingInstruction*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->data()); } -JSValuePtr jsProcessingInstructionSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsProcessingInstructionSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); ProcessingInstruction* imp = static_cast<ProcessingInstruction*>(static_cast<JSProcessingInstruction*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->sheet())); } -JSValuePtr jsProcessingInstructionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsProcessingInstructionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSProcessingInstruction*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSProcessingInstruction::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSProcessingInstruction::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSProcessingInstruction, Base>(exec, propertyName, value, &JSProcessingInstructionTable, this, slot); } -void setJSProcessingInstructionData(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSProcessingInstructionData(ExecState* exec, JSObject* thisObject, JSValue value) { ProcessingInstruction* imp = static_cast<ProcessingInstruction*>(static_cast<JSProcessingInstruction*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -166,7 +169,7 @@ void setJSProcessingInstructionData(ExecState* exec, JSObject* thisObject, JSVal setDOMException(exec, ec); } -JSValuePtr JSProcessingInstruction::getConstructor(ExecState* exec) +JSValue JSProcessingInstruction::getConstructor(ExecState* exec) { return getDOMConstructor<JSProcessingInstructionConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSProcessingInstruction.h b/src/3rdparty/webkit/WebCore/generated/JSProcessingInstruction.h index 2b08ab7692..7c0ccd6f44 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSProcessingInstruction.h +++ b/src/3rdparty/webkit/WebCore/generated/JSProcessingInstruction.h @@ -31,24 +31,25 @@ class JSProcessingInstruction : public JSNode { typedef JSNode Base; public: JSProcessingInstruction(PassRefPtr<JSC::Structure>, PassRefPtr<ProcessingInstruction>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSProcessingInstructionPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSProcessingInstructionPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,11 +57,11 @@ public: // Attributes -JSC::JSValuePtr jsProcessingInstructionTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsProcessingInstructionData(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSProcessingInstructionData(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsProcessingInstructionSheet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsProcessingInstructionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsProcessingInstructionTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsProcessingInstructionData(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSProcessingInstructionData(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsProcessingInstructionSheet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsProcessingInstructionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSProgressEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSProgressEvent.cpp index 88f9ad285a..92d6a68db2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSProgressEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSProgressEvent.cpp @@ -33,7 +33,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSProgressEvent) +ASSERT_CLASS_FITS_IN_CELL(JSProgressEvent); /* Hash table */ @@ -72,13 +72,13 @@ public: JSProgressEventConstructor(ExecState* exec) : DOMObject(JSProgressEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSProgressEventPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSProgressEventPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -108,9 +108,9 @@ static const HashTable JSProgressEventPrototypeTable = const ClassInfo JSProgressEventPrototype::s_info = { "ProgressEventPrototype", 0, &JSProgressEventPrototypeTable, 0 }; -JSObject* JSProgressEventPrototype::self(ExecState* exec) +JSObject* JSProgressEventPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSProgressEvent>(exec); + return getDOMPrototype<JSProgressEvent>(exec, globalObject); } bool JSProgressEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -125,9 +125,9 @@ JSProgressEvent::JSProgressEvent(PassRefPtr<Structure> structure, PassRefPtr<Pro { } -JSObject* JSProgressEvent::createPrototype(ExecState* exec) +JSObject* JSProgressEvent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSProgressEventPrototype(JSProgressEventPrototype::createStructure(JSEventPrototype::self(exec))); + return new (exec) JSProgressEventPrototype(JSProgressEventPrototype::createStructure(JSEventPrototype::self(exec, globalObject))); } bool JSProgressEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -135,45 +135,49 @@ bool JSProgressEvent::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSProgressEvent, Base>(exec, &JSProgressEventTable, this, propertyName, slot); } -JSValuePtr jsProgressEventLengthComputable(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsProgressEventLengthComputable(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); ProgressEvent* imp = static_cast<ProgressEvent*>(static_cast<JSProgressEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->lengthComputable()); } -JSValuePtr jsProgressEventLoaded(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsProgressEventLoaded(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); ProgressEvent* imp = static_cast<ProgressEvent*>(static_cast<JSProgressEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->loaded()); } -JSValuePtr jsProgressEventTotal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsProgressEventTotal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); ProgressEvent* imp = static_cast<ProgressEvent*>(static_cast<JSProgressEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->total()); } -JSValuePtr jsProgressEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsProgressEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSProgressEvent*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSProgressEvent::getConstructor(ExecState* exec) +JSValue JSProgressEvent::getConstructor(ExecState* exec) { return getDOMConstructor<JSProgressEventConstructor>(exec); } -JSValuePtr jsProgressEventPrototypeFunctionInitProgressEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsProgressEventPrototypeFunctionInitProgressEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSProgressEvent::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSProgressEvent::s_info)) return throwError(exec, TypeError); JSProgressEvent* castedThisObj = static_cast<JSProgressEvent*>(asObject(thisValue)); ProgressEvent* imp = static_cast<ProgressEvent*>(castedThisObj->impl()); - const UString& typeArg = args.at(exec, 0)->toString(exec); - bool canBubbleArg = args.at(exec, 1)->toBoolean(exec); - bool cancelableArg = args.at(exec, 2)->toBoolean(exec); - bool lengthComputableArg = args.at(exec, 3)->toBoolean(exec); - unsigned loadedArg = args.at(exec, 4)->toInt32(exec); - unsigned totalArg = args.at(exec, 5)->toInt32(exec); + const UString& typeArg = args.at(0).toString(exec); + bool canBubbleArg = args.at(1).toBoolean(exec); + bool cancelableArg = args.at(2).toBoolean(exec); + bool lengthComputableArg = args.at(3).toBoolean(exec); + unsigned loadedArg = args.at(4).toInt32(exec); + unsigned totalArg = args.at(5).toInt32(exec); imp->initProgressEvent(typeArg, canBubbleArg, cancelableArg, lengthComputableArg, loadedArg, totalArg); return jsUndefined(); diff --git a/src/3rdparty/webkit/WebCore/generated/JSProgressEvent.h b/src/3rdparty/webkit/WebCore/generated/JSProgressEvent.h index 5eb95d540e..5f0744ace1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSProgressEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSProgressEvent.h @@ -31,27 +31,28 @@ class JSProgressEvent : public JSEvent { typedef JSEvent Base; public: JSProgressEvent(PassRefPtr<JSC::Structure>, PassRefPtr<ProgressEvent>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSProgressEventPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,13 +61,13 @@ public: // Functions -JSC::JSValuePtr jsProgressEventPrototypeFunctionInitProgressEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsProgressEventPrototypeFunctionInitProgressEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsProgressEventLengthComputable(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsProgressEventLoaded(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsProgressEventTotal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsProgressEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsProgressEventLengthComputable(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsProgressEventLoaded(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsProgressEventTotal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsProgressEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSRGBColor.lut.h b/src/3rdparty/webkit/WebCore/generated/JSRGBColor.lut.h index 681e9abd44..03bb41528c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSRGBColor.lut.h +++ b/src/3rdparty/webkit/WebCore/generated/JSRGBColor.lut.h @@ -12,10 +12,5 @@ static const struct HashTableValue JSRGBColorTableValues[4] = { }; extern const struct HashTable JSRGBColorTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 7, JSRGBColorTableValues, 0 }; -#else { 8, 7, JSRGBColorTableValues, 0 }; -#endif - } // namespace diff --git a/src/3rdparty/webkit/WebCore/generated/JSRange.cpp b/src/3rdparty/webkit/WebCore/generated/JSRange.cpp index 7ca375724e..a8e828bd11 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSRange.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSRange.cpp @@ -40,7 +40,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSRange) +ASSERT_CLASS_FITS_IN_CELL(JSRange); /* Hash table */ @@ -90,13 +90,13 @@ public: JSRangeConstructor(ExecState* exec) : DOMObject(JSRangeConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSRangePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSRangePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -156,9 +156,9 @@ static const HashTable JSRangePrototypeTable = const ClassInfo JSRangePrototype::s_info = { "RangePrototype", 0, &JSRangePrototypeTable, 0 }; -JSObject* JSRangePrototype::self(ExecState* exec) +JSObject* JSRangePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSRange>(exec); + return getDOMPrototype<JSRange>(exec, globalObject); } bool JSRangePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -177,12 +177,11 @@ JSRange::JSRange(PassRefPtr<Structure> structure, PassRefPtr<Range> impl) JSRange::~JSRange() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSRange::createPrototype(ExecState* exec) +JSObject* JSRange::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSRangePrototype(JSRangePrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSRangePrototype(JSRangePrototype::createStructure(globalObject->objectPrototype())); } bool JSRange::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -190,216 +189,227 @@ bool JSRange::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName return getStaticValueSlot<JSRange, Base>(exec, &JSRangeTable, this, propertyName, slot); } -JSValuePtr jsRangeStartContainer(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsRangeStartContainer(ExecState* exec, const Identifier&, const PropertySlot& slot) { ExceptionCode ec = 0; Range* imp = static_cast<Range*>(static_cast<JSRange*>(asObject(slot.slotBase()))->impl()); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->startContainer(ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->startContainer(ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsRangeStartOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsRangeStartOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { ExceptionCode ec = 0; Range* imp = static_cast<Range*>(static_cast<JSRange*>(asObject(slot.slotBase()))->impl()); - JSC::JSValuePtr result = jsNumber(exec, imp->startOffset(ec)); + JSC::JSValue result = jsNumber(exec, imp->startOffset(ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsRangeEndContainer(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsRangeEndContainer(ExecState* exec, const Identifier&, const PropertySlot& slot) { ExceptionCode ec = 0; Range* imp = static_cast<Range*>(static_cast<JSRange*>(asObject(slot.slotBase()))->impl()); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->endContainer(ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->endContainer(ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsRangeEndOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsRangeEndOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { ExceptionCode ec = 0; Range* imp = static_cast<Range*>(static_cast<JSRange*>(asObject(slot.slotBase()))->impl()); - JSC::JSValuePtr result = jsNumber(exec, imp->endOffset(ec)); + JSC::JSValue result = jsNumber(exec, imp->endOffset(ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsRangeCollapsed(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsRangeCollapsed(ExecState* exec, const Identifier&, const PropertySlot& slot) { ExceptionCode ec = 0; Range* imp = static_cast<Range*>(static_cast<JSRange*>(asObject(slot.slotBase()))->impl()); - JSC::JSValuePtr result = jsBoolean(imp->collapsed(ec)); + JSC::JSValue result = jsBoolean(imp->collapsed(ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsRangeCommonAncestorContainer(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsRangeCommonAncestorContainer(ExecState* exec, const Identifier&, const PropertySlot& slot) { ExceptionCode ec = 0; Range* imp = static_cast<Range*>(static_cast<JSRange*>(asObject(slot.slotBase()))->impl()); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->commonAncestorContainer(ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->commonAncestorContainer(ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsRangeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsRangeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSRange*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSRange::getConstructor(ExecState* exec) +JSValue JSRange::getConstructor(ExecState* exec) { return getDOMConstructor<JSRangeConstructor>(exec); } -JSValuePtr jsRangePrototypeFunctionSetStart(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionSetStart(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* refNode = toNode(args.at(exec, 0)); - int offset = args.at(exec, 1)->toInt32(exec); + Node* refNode = toNode(args.at(0)); + int offset = args.at(1).toInt32(exec); imp->setStart(refNode, offset, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsRangePrototypeFunctionSetEnd(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionSetEnd(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* refNode = toNode(args.at(exec, 0)); - int offset = args.at(exec, 1)->toInt32(exec); + Node* refNode = toNode(args.at(0)); + int offset = args.at(1).toInt32(exec); imp->setEnd(refNode, offset, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsRangePrototypeFunctionSetStartBefore(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionSetStartBefore(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* refNode = toNode(args.at(exec, 0)); + Node* refNode = toNode(args.at(0)); imp->setStartBefore(refNode, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsRangePrototypeFunctionSetStartAfter(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionSetStartAfter(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* refNode = toNode(args.at(exec, 0)); + Node* refNode = toNode(args.at(0)); imp->setStartAfter(refNode, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsRangePrototypeFunctionSetEndBefore(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionSetEndBefore(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* refNode = toNode(args.at(exec, 0)); + Node* refNode = toNode(args.at(0)); imp->setEndBefore(refNode, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsRangePrototypeFunctionSetEndAfter(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionSetEndAfter(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* refNode = toNode(args.at(exec, 0)); + Node* refNode = toNode(args.at(0)); imp->setEndAfter(refNode, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsRangePrototypeFunctionCollapse(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionCollapse(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - bool toStart = args.at(exec, 0)->toBoolean(exec); + bool toStart = args.at(0).toBoolean(exec); imp->collapse(toStart, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsRangePrototypeFunctionSelectNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionSelectNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* refNode = toNode(args.at(exec, 0)); + Node* refNode = toNode(args.at(0)); imp->selectNode(refNode, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsRangePrototypeFunctionSelectNodeContents(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionSelectNodeContents(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* refNode = toNode(args.at(exec, 0)); + Node* refNode = toNode(args.at(0)); imp->selectNodeContents(refNode, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsRangePrototypeFunctionCompareBoundaryPoints(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionCompareBoundaryPoints(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - Range::CompareHow how = static_cast<Range::CompareHow>(args.at(exec, 0)->toInt32(exec)); - Range* sourceRange = toRange(args.at(exec, 1)); + Range::CompareHow how = static_cast<Range::CompareHow>(args.at(0).toInt32(exec)); + Range* sourceRange = toRange(args.at(1)); - JSC::JSValuePtr result = jsNumber(exec, imp->compareBoundaryPoints(how, sourceRange, ec)); + JSC::JSValue result = jsNumber(exec, imp->compareBoundaryPoints(how, sourceRange, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsRangePrototypeFunctionDeleteContents(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionDeleteContents(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); @@ -410,93 +420,100 @@ JSValuePtr jsRangePrototypeFunctionDeleteContents(ExecState* exec, JSObject*, JS return jsUndefined(); } -JSValuePtr jsRangePrototypeFunctionExtractContents(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionExtractContents(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->extractContents(ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->extractContents(ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsRangePrototypeFunctionCloneContents(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionCloneContents(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->cloneContents(ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->cloneContents(ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsRangePrototypeFunctionInsertNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionInsertNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* newNode = toNode(args.at(exec, 0)); + Node* newNode = toNode(args.at(0)); imp->insertNode(newNode, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsRangePrototypeFunctionSurroundContents(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionSurroundContents(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* newParent = toNode(args.at(exec, 0)); + Node* newParent = toNode(args.at(0)); imp->surroundContents(newParent, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsRangePrototypeFunctionCloneRange(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionCloneRange(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->cloneRange(ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->cloneRange(ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsRangePrototypeFunctionToString(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - JSC::JSValuePtr result = jsString(exec, imp->toString(ec)); + JSC::JSValue result = jsString(exec, imp->toString(ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsRangePrototypeFunctionDetach(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionDetach(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); @@ -507,132 +524,137 @@ JSValuePtr jsRangePrototypeFunctionDetach(ExecState* exec, JSObject*, JSValuePtr return jsUndefined(); } -JSValuePtr jsRangePrototypeFunctionCreateContextualFragment(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionCreateContextualFragment(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& html = args.at(exec, 0)->toString(exec); + const UString& html = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createContextualFragment(html, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createContextualFragment(html, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsRangePrototypeFunctionIntersectsNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionIntersectsNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* refNode = toNode(args.at(exec, 0)); + Node* refNode = toNode(args.at(0)); - JSC::JSValuePtr result = jsBoolean(imp->intersectsNode(refNode, ec)); + JSC::JSValue result = jsBoolean(imp->intersectsNode(refNode, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsRangePrototypeFunctionCompareNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionCompareNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* refNode = toNode(args.at(exec, 0)); + Node* refNode = toNode(args.at(0)); - JSC::JSValuePtr result = jsNumber(exec, imp->compareNode(refNode, ec)); + JSC::JSValue result = jsNumber(exec, imp->compareNode(refNode, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsRangePrototypeFunctionComparePoint(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionComparePoint(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* refNode = toNode(args.at(exec, 0)); - int offset = args.at(exec, 1)->toInt32(exec); + Node* refNode = toNode(args.at(0)); + int offset = args.at(1).toInt32(exec); - JSC::JSValuePtr result = jsNumber(exec, imp->comparePoint(refNode, offset, ec)); + JSC::JSValue result = jsNumber(exec, imp->comparePoint(refNode, offset, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsRangePrototypeFunctionIsPointInRange(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangePrototypeFunctionIsPointInRange(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRange::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRange::s_info)) return throwError(exec, TypeError); JSRange* castedThisObj = static_cast<JSRange*>(asObject(thisValue)); Range* imp = static_cast<Range*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* refNode = toNode(args.at(exec, 0)); - int offset = args.at(exec, 1)->toInt32(exec); + Node* refNode = toNode(args.at(0)); + int offset = args.at(1).toInt32(exec); - JSC::JSValuePtr result = jsBoolean(imp->isPointInRange(refNode, offset, ec)); + JSC::JSValue result = jsBoolean(imp->isPointInRange(refNode, offset, ec)); setDOMException(exec, ec); return result; } // Constant getters -JSValuePtr jsRangeSTART_TO_START(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsRangeSTART_TO_START(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsRangeSTART_TO_END(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsRangeSTART_TO_END(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsRangeEND_TO_END(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsRangeEND_TO_END(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsRangeEND_TO_START(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsRangeEND_TO_START(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsRangeNODE_BEFORE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsRangeNODE_BEFORE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsRangeNODE_AFTER(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsRangeNODE_AFTER(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsRangeNODE_BEFORE_AND_AFTER(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsRangeNODE_BEFORE_AND_AFTER(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsRangeNODE_INSIDE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsRangeNODE_INSIDE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, Range* object) +JSC::JSValue toJS(JSC::ExecState* exec, Range* object) { return getDOMObjectWrapper<JSRange>(exec, object); } -Range* toRange(JSC::JSValuePtr value) +Range* toRange(JSC::JSValue value) { - return value->isObject(&JSRange::s_info) ? static_cast<JSRange*>(asObject(value))->impl() : 0; + return value.isObject(&JSRange::s_info) ? static_cast<JSRange*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSRange.h b/src/3rdparty/webkit/WebCore/generated/JSRange.h index bc7991257d..4d8a6f9294 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSRange.h +++ b/src/3rdparty/webkit/WebCore/generated/JSRange.h @@ -34,33 +34,34 @@ class JSRange : public DOMObject { public: JSRange(PassRefPtr<JSC::Structure>, PassRefPtr<Range>); virtual ~JSRange(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); Range* impl() const { return m_impl.get(); } private: RefPtr<Range> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, Range*); -Range* toRange(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, Range*); +Range* toRange(JSC::JSValue); class JSRangePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -69,48 +70,48 @@ public: // Functions -JSC::JSValuePtr jsRangePrototypeFunctionSetStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionSetEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionSetStartBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionSetStartAfter(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionSetEndBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionSetEndAfter(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionCollapse(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionSelectNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionSelectNodeContents(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionCompareBoundaryPoints(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionDeleteContents(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionExtractContents(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionCloneContents(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionInsertNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionSurroundContents(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionCloneRange(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionDetach(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionCreateContextualFragment(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionIntersectsNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionCompareNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionComparePoint(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsRangePrototypeFunctionIsPointInRange(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionSetStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionSetEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionSetStartBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionSetStartAfter(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionSetEndBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionSetEndAfter(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionCollapse(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionSelectNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionSelectNodeContents(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionCompareBoundaryPoints(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionDeleteContents(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionExtractContents(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionCloneContents(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionInsertNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionSurroundContents(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionCloneRange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionDetach(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionCreateContextualFragment(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionIntersectsNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionCompareNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionComparePoint(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangePrototypeFunctionIsPointInRange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsRangeStartContainer(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeStartOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeEndContainer(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeEndOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeCollapsed(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeCommonAncestorContainer(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeStartContainer(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeStartOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeEndContainer(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeEndOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeCollapsed(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeCommonAncestorContainer(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsRangeSTART_TO_START(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeSTART_TO_END(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeEND_TO_END(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeEND_TO_START(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeNODE_BEFORE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeNODE_AFTER(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeNODE_BEFORE_AND_AFTER(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeNODE_INSIDE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeSTART_TO_START(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeSTART_TO_END(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeEND_TO_END(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeEND_TO_START(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeNODE_BEFORE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeNODE_AFTER(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeNODE_BEFORE_AND_AFTER(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeNODE_INSIDE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSRangeException.cpp b/src/3rdparty/webkit/WebCore/generated/JSRangeException.cpp index e796c7d8d5..faf979429d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSRangeException.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSRangeException.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSRangeException) +ASSERT_CLASS_FITS_IN_CELL(JSRangeException); /* Hash table */ @@ -76,13 +76,13 @@ public: JSRangeExceptionConstructor(ExecState* exec) : DOMObject(JSRangeExceptionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSRangeExceptionPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSRangeExceptionPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -114,9 +114,9 @@ static const HashTable JSRangeExceptionPrototypeTable = const ClassInfo JSRangeExceptionPrototype::s_info = { "RangeExceptionPrototype", 0, &JSRangeExceptionPrototypeTable, 0 }; -JSObject* JSRangeExceptionPrototype::self(ExecState* exec) +JSObject* JSRangeExceptionPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSRangeException>(exec); + return getDOMPrototype<JSRangeException>(exec, globalObject); } bool JSRangeExceptionPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -135,12 +135,11 @@ JSRangeException::JSRangeException(PassRefPtr<Structure> structure, PassRefPtr<R JSRangeException::~JSRangeException() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSRangeException::createPrototype(ExecState* exec) +JSObject* JSRangeException::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSRangeExceptionPrototype(JSRangeExceptionPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSRangeExceptionPrototype(JSRangeExceptionPrototype::createStructure(globalObject->objectPrototype())); } bool JSRangeException::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -148,64 +147,68 @@ bool JSRangeException::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSRangeException, Base>(exec, &JSRangeExceptionTable, this, propertyName, slot); } -JSValuePtr jsRangeExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsRangeExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); RangeException* imp = static_cast<RangeException*>(static_cast<JSRangeException*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->code()); } -JSValuePtr jsRangeExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsRangeExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); RangeException* imp = static_cast<RangeException*>(static_cast<JSRangeException*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsRangeExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsRangeExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); RangeException* imp = static_cast<RangeException*>(static_cast<JSRangeException*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->message()); } -JSValuePtr jsRangeExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsRangeExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSRangeException*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSRangeException::getConstructor(ExecState* exec) +JSValue JSRangeException::getConstructor(ExecState* exec) { return getDOMConstructor<JSRangeExceptionConstructor>(exec); } -JSValuePtr jsRangeExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsRangeExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSRangeException::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSRangeException::s_info)) return throwError(exec, TypeError); JSRangeException* castedThisObj = static_cast<JSRangeException*>(asObject(thisValue)); RangeException* imp = static_cast<RangeException*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsString(exec, imp->toString()); + JSC::JSValue result = jsString(exec, imp->toString()); return result; } // Constant getters -JSValuePtr jsRangeExceptionBAD_BOUNDARYPOINTS_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsRangeExceptionBAD_BOUNDARYPOINTS_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsRangeExceptionINVALID_NODE_TYPE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsRangeExceptionINVALID_NODE_TYPE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, RangeException* object) +JSC::JSValue toJS(JSC::ExecState* exec, RangeException* object) { return getDOMObjectWrapper<JSRangeException>(exec, object); } -RangeException* toRangeException(JSC::JSValuePtr value) +RangeException* toRangeException(JSC::JSValue value) { - return value->isObject(&JSRangeException::s_info) ? static_cast<JSRangeException*>(asObject(value))->impl() : 0; + return value.isObject(&JSRangeException::s_info) ? static_cast<JSRangeException*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSRangeException.h b/src/3rdparty/webkit/WebCore/generated/JSRangeException.h index fc35242dd1..5c45cd2df1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSRangeException.h +++ b/src/3rdparty/webkit/WebCore/generated/JSRangeException.h @@ -34,33 +34,34 @@ class JSRangeException : public DOMObject { public: JSRangeException(PassRefPtr<JSC::Structure>, PassRefPtr<RangeException>); virtual ~JSRangeException(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); RangeException* impl() const { return m_impl.get(); } private: RefPtr<RangeException> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, RangeException*); -RangeException* toRangeException(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, RangeException*); +RangeException* toRangeException(JSC::JSValue); class JSRangeExceptionPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -69,17 +70,17 @@ public: // Functions -JSC::JSValuePtr jsRangeExceptionPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsRangeExceptionPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsRangeExceptionCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeExceptionName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeExceptionMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeExceptionCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeExceptionName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeExceptionMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsRangeExceptionBAD_BOUNDARYPOINTS_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRangeExceptionINVALID_NODE_TYPE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeExceptionBAD_BOUNDARYPOINTS_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRangeExceptionINVALID_NODE_TYPE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSRect.cpp b/src/3rdparty/webkit/WebCore/generated/JSRect.cpp index 655afa01a2..3fdee7cb00 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSRect.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSRect.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSRect) +ASSERT_CLASS_FITS_IN_CELL(JSRect); /* Hash table */ @@ -74,13 +74,13 @@ public: JSRectConstructor(ExecState* exec) : DOMObject(JSRectConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSRectPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSRectPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -109,9 +109,9 @@ static const HashTable JSRectPrototypeTable = const ClassInfo JSRectPrototype::s_info = { "RectPrototype", 0, &JSRectPrototypeTable, 0 }; -JSObject* JSRectPrototype::self(ExecState* exec) +JSObject* JSRectPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSRect>(exec); + return getDOMPrototype<JSRect>(exec, globalObject); } const ClassInfo JSRect::s_info = { "Rect", 0, &JSRectTable, 0 }; @@ -125,12 +125,11 @@ JSRect::JSRect(PassRefPtr<Structure> structure, PassRefPtr<Rect> impl) JSRect::~JSRect() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSRect::createPrototype(ExecState* exec) +JSObject* JSRect::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSRectPrototype(JSRectPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSRectPrototype(JSRectPrototype::createStructure(globalObject->objectPrototype())); } bool JSRect::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -138,46 +137,50 @@ bool JSRect::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, return getStaticValueSlot<JSRect, Base>(exec, &JSRectTable, this, propertyName, slot); } -JSValuePtr jsRectTop(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsRectTop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Rect* imp = static_cast<Rect*>(static_cast<JSRect*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->top())); } -JSValuePtr jsRectRight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsRectRight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Rect* imp = static_cast<Rect*>(static_cast<JSRect*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->right())); } -JSValuePtr jsRectBottom(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsRectBottom(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Rect* imp = static_cast<Rect*>(static_cast<JSRect*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->bottom())); } -JSValuePtr jsRectLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsRectLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Rect* imp = static_cast<Rect*>(static_cast<JSRect*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->left())); } -JSValuePtr jsRectConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsRectConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSRect*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSRect::getConstructor(ExecState* exec) +JSValue JSRect::getConstructor(ExecState* exec) { return getDOMConstructor<JSRectConstructor>(exec); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, Rect* object) +JSC::JSValue toJS(JSC::ExecState* exec, Rect* object) { return getDOMObjectWrapper<JSRect>(exec, object); } -Rect* toRect(JSC::JSValuePtr value) +Rect* toRect(JSC::JSValue value) { - return value->isObject(&JSRect::s_info) ? static_cast<JSRect*>(asObject(value))->impl() : 0; + return value.isObject(&JSRect::s_info) ? static_cast<JSRect*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSRect.h b/src/3rdparty/webkit/WebCore/generated/JSRect.h index 069ee810a4..be2396609d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSRect.h +++ b/src/3rdparty/webkit/WebCore/generated/JSRect.h @@ -34,29 +34,30 @@ class JSRect : public DOMObject { public: JSRect(PassRefPtr<JSC::Structure>, PassRefPtr<Rect>); virtual ~JSRect(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); Rect* impl() const { return m_impl.get(); } private: RefPtr<Rect> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, Rect*); -Rect* toRect(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, Rect*); +Rect* toRect(JSC::JSValue); class JSRectPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSRectPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -64,11 +65,11 @@ public: // Attributes -JSC::JSValuePtr jsRectTop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRectRight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRectBottom(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRectLeft(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsRectConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRectTop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRectRight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRectBottom(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRectLeft(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRectConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSQLError.cpp b/src/3rdparty/webkit/WebCore/generated/JSSQLError.cpp index 3614d6a722..2d6abf125e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSQLError.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSQLError.cpp @@ -20,6 +20,9 @@ #include "config.h" + +#if ENABLE(DATABASE) + #include "JSSQLError.h" #include <wtf/GetPtr.h> @@ -34,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSQLError) +ASSERT_CLASS_FITS_IN_CELL(JSSQLError); /* Hash table */ @@ -68,9 +71,9 @@ static const HashTable JSSQLErrorPrototypeTable = const ClassInfo JSSQLErrorPrototype::s_info = { "SQLErrorPrototype", 0, &JSSQLErrorPrototypeTable, 0 }; -JSObject* JSSQLErrorPrototype::self(ExecState* exec) +JSObject* JSSQLErrorPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSQLError>(exec); + return getDOMPrototype<JSSQLError>(exec, globalObject); } const ClassInfo JSSQLError::s_info = { "SQLError", 0, &JSSQLErrorTable, 0 }; @@ -84,12 +87,11 @@ JSSQLError::JSSQLError(PassRefPtr<Structure> structure, PassRefPtr<SQLError> imp JSSQLError::~JSSQLError() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSQLError::createPrototype(ExecState* exec) +JSObject* JSSQLError::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSQLErrorPrototype(JSSQLErrorPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSQLErrorPrototype(JSSQLErrorPrototype::createStructure(globalObject->objectPrototype())); } bool JSSQLError::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -97,25 +99,29 @@ bool JSSQLError::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN return getStaticValueSlot<JSSQLError, Base>(exec, &JSSQLErrorTable, this, propertyName, slot); } -JSValuePtr jsSQLErrorCode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSQLErrorCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SQLError* imp = static_cast<SQLError*>(static_cast<JSSQLError*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->code()); } -JSValuePtr jsSQLErrorMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSQLErrorMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SQLError* imp = static_cast<SQLError*>(static_cast<JSSQLError*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->message()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SQLError* object) +JSC::JSValue toJS(JSC::ExecState* exec, SQLError* object) { return getDOMObjectWrapper<JSSQLError>(exec, object); } -SQLError* toSQLError(JSC::JSValuePtr value) +SQLError* toSQLError(JSC::JSValue value) { - return value->isObject(&JSSQLError::s_info) ? static_cast<JSSQLError*>(asObject(value))->impl() : 0; + return value.isObject(&JSSQLError::s_info) ? static_cast<JSSQLError*>(asObject(value))->impl() : 0; } } + +#endif // ENABLE(DATABASE) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSQLError.h b/src/3rdparty/webkit/WebCore/generated/JSSQLError.h index 470a72e303..a2389c7098 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSQLError.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSQLError.h @@ -21,6 +21,9 @@ #ifndef JSSQLError_h #define JSSQLError_h + +#if ENABLE(DATABASE) + #include "JSDOMBinding.h" #include <runtime/JSGlobalObject.h> #include <runtime/ObjectPrototype.h> @@ -34,12 +37,12 @@ class JSSQLError : public DOMObject { public: JSSQLError(PassRefPtr<JSC::Structure>, PassRefPtr<SQLError>); virtual ~JSSQLError(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -50,12 +53,13 @@ private: RefPtr<SQLError> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SQLError*); -SQLError* toSQLError(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SQLError*); +SQLError* toSQLError(JSC::JSValue); class JSSQLErrorPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSQLErrorPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -63,9 +67,11 @@ public: // Attributes -JSC::JSValuePtr jsSQLErrorCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSQLErrorMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSQLErrorCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSQLErrorMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore +#endif // ENABLE(DATABASE) + #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSQLResultSet.cpp b/src/3rdparty/webkit/WebCore/generated/JSSQLResultSet.cpp index e2b23e8059..6aa3394c31 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSQLResultSet.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSQLResultSet.cpp @@ -20,6 +20,9 @@ #include "config.h" + +#if ENABLE(DATABASE) + #include "JSSQLResultSet.h" #include <wtf/GetPtr.h> @@ -34,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSQLResultSet) +ASSERT_CLASS_FITS_IN_CELL(JSSQLResultSet); /* Hash table */ @@ -69,9 +72,9 @@ static const HashTable JSSQLResultSetPrototypeTable = const ClassInfo JSSQLResultSetPrototype::s_info = { "SQLResultSetPrototype", 0, &JSSQLResultSetPrototypeTable, 0 }; -JSObject* JSSQLResultSetPrototype::self(ExecState* exec) +JSObject* JSSQLResultSetPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSQLResultSet>(exec); + return getDOMPrototype<JSSQLResultSet>(exec, globalObject); } const ClassInfo JSSQLResultSet::s_info = { "SQLResultSet", 0, &JSSQLResultSetTable, 0 }; @@ -85,12 +88,11 @@ JSSQLResultSet::JSSQLResultSet(PassRefPtr<Structure> structure, PassRefPtr<SQLRe JSSQLResultSet::~JSSQLResultSet() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSQLResultSet::createPrototype(ExecState* exec) +JSObject* JSSQLResultSet::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSQLResultSetPrototype(JSSQLResultSetPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSQLResultSetPrototype(JSSQLResultSetPrototype::createStructure(globalObject->objectPrototype())); } bool JSSQLResultSet::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -98,34 +100,38 @@ bool JSSQLResultSet::getOwnPropertySlot(ExecState* exec, const Identifier& prope return getStaticValueSlot<JSSQLResultSet, Base>(exec, &JSSQLResultSetTable, this, propertyName, slot); } -JSValuePtr jsSQLResultSetRows(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSQLResultSetRows(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SQLResultSet* imp = static_cast<SQLResultSet*>(static_cast<JSSQLResultSet*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->rows())); } -JSValuePtr jsSQLResultSetInsertId(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSQLResultSetInsertId(ExecState* exec, const Identifier&, const PropertySlot& slot) { ExceptionCode ec = 0; SQLResultSet* imp = static_cast<SQLResultSet*>(static_cast<JSSQLResultSet*>(asObject(slot.slotBase()))->impl()); - JSC::JSValuePtr result = jsNumber(exec, imp->insertId(ec)); + JSC::JSValue result = jsNumber(exec, imp->insertId(ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsSQLResultSetRowsAffected(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSQLResultSetRowsAffected(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SQLResultSet* imp = static_cast<SQLResultSet*>(static_cast<JSSQLResultSet*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->rowsAffected()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SQLResultSet* object) +JSC::JSValue toJS(JSC::ExecState* exec, SQLResultSet* object) { return getDOMObjectWrapper<JSSQLResultSet>(exec, object); } -SQLResultSet* toSQLResultSet(JSC::JSValuePtr value) +SQLResultSet* toSQLResultSet(JSC::JSValue value) { - return value->isObject(&JSSQLResultSet::s_info) ? static_cast<JSSQLResultSet*>(asObject(value))->impl() : 0; + return value.isObject(&JSSQLResultSet::s_info) ? static_cast<JSSQLResultSet*>(asObject(value))->impl() : 0; } } + +#endif // ENABLE(DATABASE) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSQLResultSet.h b/src/3rdparty/webkit/WebCore/generated/JSSQLResultSet.h index 0b8ac33e9c..a708847f4f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSQLResultSet.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSQLResultSet.h @@ -21,6 +21,9 @@ #ifndef JSSQLResultSet_h #define JSSQLResultSet_h + +#if ENABLE(DATABASE) + #include "JSDOMBinding.h" #include <runtime/JSGlobalObject.h> #include <runtime/ObjectPrototype.h> @@ -34,12 +37,12 @@ class JSSQLResultSet : public DOMObject { public: JSSQLResultSet(PassRefPtr<JSC::Structure>, PassRefPtr<SQLResultSet>); virtual ~JSSQLResultSet(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -50,12 +53,13 @@ private: RefPtr<SQLResultSet> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SQLResultSet*); -SQLResultSet* toSQLResultSet(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SQLResultSet*); +SQLResultSet* toSQLResultSet(JSC::JSValue); class JSSQLResultSetPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSQLResultSetPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -63,10 +67,12 @@ public: // Attributes -JSC::JSValuePtr jsSQLResultSetRows(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSQLResultSetInsertId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSQLResultSetRowsAffected(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSQLResultSetRows(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSQLResultSetInsertId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSQLResultSetRowsAffected(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore +#endif // ENABLE(DATABASE) + #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSQLResultSetRowList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSQLResultSetRowList.cpp index da1804acd7..8f60335e26 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSQLResultSetRowList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSQLResultSetRowList.cpp @@ -20,6 +20,9 @@ #include "config.h" + +#if ENABLE(DATABASE) + #include "JSSQLResultSetRowList.h" #include <wtf/GetPtr.h> @@ -33,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSQLResultSetRowList) +ASSERT_CLASS_FITS_IN_CELL(JSSQLResultSetRowList); /* Hash table */ @@ -67,9 +70,9 @@ static const HashTable JSSQLResultSetRowListPrototypeTable = const ClassInfo JSSQLResultSetRowListPrototype::s_info = { "SQLResultSetRowListPrototype", 0, &JSSQLResultSetRowListPrototypeTable, 0 }; -JSObject* JSSQLResultSetRowListPrototype::self(ExecState* exec) +JSObject* JSSQLResultSetRowListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSQLResultSetRowList>(exec); + return getDOMPrototype<JSSQLResultSetRowList>(exec, globalObject); } bool JSSQLResultSetRowListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -88,12 +91,11 @@ JSSQLResultSetRowList::JSSQLResultSetRowList(PassRefPtr<Structure> structure, Pa JSSQLResultSetRowList::~JSSQLResultSetRowList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSQLResultSetRowList::createPrototype(ExecState* exec) +JSObject* JSSQLResultSetRowList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSQLResultSetRowListPrototype(JSSQLResultSetRowListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSQLResultSetRowListPrototype(JSSQLResultSetRowListPrototype::createStructure(globalObject->objectPrototype())); } bool JSSQLResultSetRowList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -101,27 +103,31 @@ bool JSSQLResultSetRowList::getOwnPropertySlot(ExecState* exec, const Identifier return getStaticValueSlot<JSSQLResultSetRowList, Base>(exec, &JSSQLResultSetRowListTable, this, propertyName, slot); } -JSValuePtr jsSQLResultSetRowListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSQLResultSetRowListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SQLResultSetRowList* imp = static_cast<SQLResultSetRowList*>(static_cast<JSSQLResultSetRowList*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsSQLResultSetRowListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSQLResultSetRowListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSQLResultSetRowList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSQLResultSetRowList::s_info)) return throwError(exec, TypeError); JSSQLResultSetRowList* castedThisObj = static_cast<JSSQLResultSetRowList*>(asObject(thisValue)); return castedThisObj->item(exec, args); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SQLResultSetRowList* object) +JSC::JSValue toJS(JSC::ExecState* exec, SQLResultSetRowList* object) { return getDOMObjectWrapper<JSSQLResultSetRowList>(exec, object); } -SQLResultSetRowList* toSQLResultSetRowList(JSC::JSValuePtr value) +SQLResultSetRowList* toSQLResultSetRowList(JSC::JSValue value) { - return value->isObject(&JSSQLResultSetRowList::s_info) ? static_cast<JSSQLResultSetRowList*>(asObject(value))->impl() : 0; + return value.isObject(&JSSQLResultSetRowList::s_info) ? static_cast<JSSQLResultSetRowList*>(asObject(value))->impl() : 0; } } + +#endif // ENABLE(DATABASE) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSQLResultSetRowList.h b/src/3rdparty/webkit/WebCore/generated/JSSQLResultSetRowList.h index d2287c4433..c5b30f70eb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSQLResultSetRowList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSQLResultSetRowList.h @@ -21,6 +21,9 @@ #ifndef JSSQLResultSetRowList_h #define JSSQLResultSetRowList_h + +#if ENABLE(DATABASE) + #include "JSDOMBinding.h" #include <runtime/JSGlobalObject.h> #include <runtime/ObjectPrototype.h> @@ -34,35 +37,36 @@ class JSSQLResultSetRowList : public DOMObject { public: JSSQLResultSetRowList(PassRefPtr<JSC::Structure>, PassRefPtr<SQLResultSetRowList>); virtual ~JSSQLResultSetRowList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } // Custom functions - JSC::JSValuePtr item(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue item(JSC::ExecState*, const JSC::ArgList&); SQLResultSetRowList* impl() const { return m_impl.get(); } private: RefPtr<SQLResultSetRowList> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SQLResultSetRowList*); -SQLResultSetRowList* toSQLResultSetRowList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SQLResultSetRowList*); +SQLResultSetRowList* toSQLResultSetRowList(JSC::JSValue); class JSSQLResultSetRowListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -71,11 +75,13 @@ public: // Functions -JSC::JSValuePtr jsSQLResultSetRowListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSQLResultSetRowListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSQLResultSetRowListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSQLResultSetRowListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore +#endif // ENABLE(DATABASE) + #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSQLTransaction.cpp b/src/3rdparty/webkit/WebCore/generated/JSSQLTransaction.cpp index 01a9a30575..d65771e3cf 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSQLTransaction.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSQLTransaction.cpp @@ -20,6 +20,9 @@ #include "config.h" + +#if ENABLE(DATABASE) + #include "JSSQLTransaction.h" #include <wtf/GetPtr.h> @@ -32,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSQLTransaction) +ASSERT_CLASS_FITS_IN_CELL(JSSQLTransaction); /* Hash table for prototype */ @@ -51,9 +54,9 @@ static const HashTable JSSQLTransactionPrototypeTable = const ClassInfo JSSQLTransactionPrototype::s_info = { "SQLTransactionPrototype", 0, &JSSQLTransactionPrototypeTable, 0 }; -JSObject* JSSQLTransactionPrototype::self(ExecState* exec) +JSObject* JSSQLTransactionPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSQLTransaction>(exec); + return getDOMPrototype<JSSQLTransaction>(exec, globalObject); } bool JSSQLTransactionPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -72,29 +75,31 @@ JSSQLTransaction::JSSQLTransaction(PassRefPtr<Structure> structure, PassRefPtr<S JSSQLTransaction::~JSSQLTransaction() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSQLTransaction::createPrototype(ExecState* exec) +JSObject* JSSQLTransaction::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSQLTransactionPrototype(JSSQLTransactionPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSQLTransactionPrototype(JSSQLTransactionPrototype::createStructure(globalObject->objectPrototype())); } -JSValuePtr jsSQLTransactionPrototypeFunctionExecuteSql(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSQLTransactionPrototypeFunctionExecuteSql(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSQLTransaction::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSQLTransaction::s_info)) return throwError(exec, TypeError); JSSQLTransaction* castedThisObj = static_cast<JSSQLTransaction*>(asObject(thisValue)); return castedThisObj->executeSql(exec, args); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SQLTransaction* object) +JSC::JSValue toJS(JSC::ExecState* exec, SQLTransaction* object) { return getDOMObjectWrapper<JSSQLTransaction>(exec, object); } -SQLTransaction* toSQLTransaction(JSC::JSValuePtr value) +SQLTransaction* toSQLTransaction(JSC::JSValue value) { - return value->isObject(&JSSQLTransaction::s_info) ? static_cast<JSSQLTransaction*>(asObject(value))->impl() : 0; + return value.isObject(&JSSQLTransaction::s_info) ? static_cast<JSSQLTransaction*>(asObject(value))->impl() : 0; } } + +#endif // ENABLE(DATABASE) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSQLTransaction.h b/src/3rdparty/webkit/WebCore/generated/JSSQLTransaction.h index baa7240096..e0190a87d9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSQLTransaction.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSQLTransaction.h @@ -21,6 +21,9 @@ #ifndef JSSQLTransaction_h #define JSSQLTransaction_h + +#if ENABLE(DATABASE) + #include "JSDOMBinding.h" #include <runtime/JSGlobalObject.h> #include <runtime/ObjectPrototype.h> @@ -34,29 +37,30 @@ class JSSQLTransaction : public DOMObject { public: JSSQLTransaction(PassRefPtr<JSC::Structure>, PassRefPtr<SQLTransaction>); virtual ~JSSQLTransaction(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; // Custom functions - JSC::JSValuePtr executeSql(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue executeSql(JSC::ExecState*, const JSC::ArgList&); SQLTransaction* impl() const { return m_impl.get(); } private: RefPtr<SQLTransaction> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SQLTransaction*); -SQLTransaction* toSQLTransaction(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SQLTransaction*); +SQLTransaction* toSQLTransaction(JSC::JSValue); class JSSQLTransactionPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -65,8 +69,10 @@ public: // Functions -JSC::JSValuePtr jsSQLTransactionPrototypeFunctionExecuteSql(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSQLTransactionPrototypeFunctionExecuteSql(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); } // namespace WebCore +#endif // ENABLE(DATABASE) + #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAElement.cpp index ef5977d279..ee98ed0a01 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAElement.cpp @@ -52,7 +52,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAElement); /* Hash table */ @@ -103,9 +103,9 @@ static const HashTable JSSVGAElementPrototypeTable = const ClassInfo JSSVGAElementPrototype::s_info = { "SVGAElementPrototype", 0, &JSSVGAElementPrototypeTable, 0 }; -JSObject* JSSVGAElementPrototype::self(ExecState* exec) +JSObject* JSSVGAElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAElement>(exec); + return getDOMPrototype<JSSVGAElement>(exec, globalObject); } bool JSSVGAElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -120,9 +120,9 @@ JSSVGAElement::JSSVGAElement(PassRefPtr<Structure> structure, PassRefPtr<SVGAEle { } -JSObject* JSSVGAElement::createPrototype(ExecState* exec) +JSObject* JSSVGAElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAElementPrototype(JSSVGAElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGAElementPrototype(JSSVGAElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGAElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -130,179 +130,198 @@ bool JSSVGAElement::getOwnPropertySlot(ExecState* exec, const Identifier& proper return getStaticValueSlot<JSSVGAElement, Base>(exec, &JSSVGAElementTable, this, propertyName, slot); } -JSValuePtr jsSVGAElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAElement* imp = static_cast<SVGAElement*>(static_cast<JSSVGAElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->targetAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGAElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAElement* imp = static_cast<SVGAElement*>(static_cast<JSSVGAElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->hrefAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGAElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAElement* imp = static_cast<SVGAElement*>(static_cast<JSSVGAElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGAElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAElement* imp = static_cast<SVGAElement*>(static_cast<JSSVGAElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGAElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAElement* imp = static_cast<SVGAElement*>(static_cast<JSSVGAElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGAElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAElement* imp = static_cast<SVGAElement*>(static_cast<JSSVGAElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGAElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAElement* imp = static_cast<SVGAElement*>(static_cast<JSSVGAElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGAElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAElement* imp = static_cast<SVGAElement*>(static_cast<JSSVGAElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGAElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAElement* imp = static_cast<SVGAElement*>(static_cast<JSSVGAElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGAElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAElement* imp = static_cast<SVGAElement*>(static_cast<JSSVGAElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGAElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAElement* imp = static_cast<SVGAElement*>(static_cast<JSSVGAElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->transformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGAElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAElement* imp = static_cast<SVGAElement*>(static_cast<JSSVGAElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGAElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAElement* imp = static_cast<SVGAElement*>(static_cast<JSSVGAElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -void JSSVGAElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGAElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGAElement, Base>(exec, propertyName, value, &JSSVGAElementTable, this, slot); } -void setJSSVGAElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGAElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGAElement* imp = static_cast<SVGAElement*>(static_cast<JSSVGAElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGAElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGAElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGAElement* imp = static_cast<SVGAElement*>(static_cast<JSSVGAElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGAElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGAElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGAElement::s_info)) return throwError(exec, TypeError); JSSVGAElement* castedThisObj = static_cast<JSSVGAElement*>(asObject(thisValue)); SVGAElement* imp = static_cast<SVGAElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGAElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGAElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGAElement::s_info)) return throwError(exec, TypeError); JSSVGAElement* castedThisObj = static_cast<JSSVGAElement*>(asObject(thisValue)); SVGAElement* imp = static_cast<SVGAElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } -JSValuePtr jsSVGAElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGAElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGAElement::s_info)) return throwError(exec, TypeError); JSSVGAElement* castedThisObj = static_cast<JSSVGAElement*>(asObject(thisValue)); SVGAElement* imp = static_cast<SVGAElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGAElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGAElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGAElement::s_info)) return throwError(exec, TypeError); JSSVGAElement* castedThisObj = static_cast<JSSVGAElement*>(asObject(thisValue)); SVGAElement* imp = static_cast<SVGAElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGAElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGAElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGAElement::s_info)) return throwError(exec, TypeError); JSSVGAElement* castedThisObj = static_cast<JSSVGAElement*>(asObject(thisValue)); SVGAElement* imp = static_cast<SVGAElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGAElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGAElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGAElement::s_info)) return throwError(exec, TypeError); JSSVGAElement* castedThisObj = static_cast<JSSVGAElement*>(asObject(thisValue)); SVGAElement* imp = static_cast<SVGAElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAElement.h index b5ca1fb6c0..8b3f3da9be 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAElement.h @@ -34,13 +34,13 @@ class JSSVGAElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGAElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGAElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,29 +64,29 @@ public: // Functions -JSC::JSValuePtr jsSVGAElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGAElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGAElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGAElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGAElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGAElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGAElementTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGAElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGAElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGAElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGAElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAElementTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGAElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGAElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGAElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGAElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAltGlyphElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAltGlyphElement.cpp index 5409761824..81a4c84fda 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAltGlyphElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAltGlyphElement.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAltGlyphElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAltGlyphElement); /* Hash table */ @@ -73,9 +73,9 @@ static const HashTable JSSVGAltGlyphElementPrototypeTable = const ClassInfo JSSVGAltGlyphElementPrototype::s_info = { "SVGAltGlyphElementPrototype", 0, &JSSVGAltGlyphElementPrototypeTable, 0 }; -JSObject* JSSVGAltGlyphElementPrototype::self(ExecState* exec) +JSObject* JSSVGAltGlyphElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAltGlyphElement>(exec); + return getDOMPrototype<JSSVGAltGlyphElement>(exec, globalObject); } const ClassInfo JSSVGAltGlyphElement::s_info = { "SVGAltGlyphElement", &JSSVGTextPositioningElement::s_info, &JSSVGAltGlyphElementTable, 0 }; @@ -85,9 +85,9 @@ JSSVGAltGlyphElement::JSSVGAltGlyphElement(PassRefPtr<Structure> structure, Pass { } -JSObject* JSSVGAltGlyphElement::createPrototype(ExecState* exec) +JSObject* JSSVGAltGlyphElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAltGlyphElementPrototype(JSSVGAltGlyphElementPrototype::createStructure(JSSVGTextPositioningElementPrototype::self(exec))); + return new (exec) JSSVGAltGlyphElementPrototype(JSSVGAltGlyphElementPrototype::createStructure(JSSVGTextPositioningElementPrototype::self(exec, globalObject))); } bool JSSVGAltGlyphElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -95,43 +95,46 @@ bool JSSVGAltGlyphElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGAltGlyphElement, Base>(exec, &JSSVGAltGlyphElementTable, this, propertyName, slot); } -JSValuePtr jsSVGAltGlyphElementGlyphRef(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAltGlyphElementGlyphRef(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAltGlyphElement* imp = static_cast<SVGAltGlyphElement*>(static_cast<JSSVGAltGlyphElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->glyphRef()); } -JSValuePtr jsSVGAltGlyphElementFormat(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAltGlyphElementFormat(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAltGlyphElement* imp = static_cast<SVGAltGlyphElement*>(static_cast<JSSVGAltGlyphElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->format()); } -JSValuePtr jsSVGAltGlyphElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAltGlyphElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAltGlyphElement* imp = static_cast<SVGAltGlyphElement*>(static_cast<JSSVGAltGlyphElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->hrefAnimated(); return toJS(exec, obj.get(), imp); } -void JSSVGAltGlyphElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGAltGlyphElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGAltGlyphElement, Base>(exec, propertyName, value, &JSSVGAltGlyphElementTable, this, slot); } -void setJSSVGAltGlyphElementGlyphRef(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGAltGlyphElementGlyphRef(ExecState* exec, JSObject* thisObject, JSValue value) { SVGAltGlyphElement* imp = static_cast<SVGAltGlyphElement*>(static_cast<JSSVGAltGlyphElement*>(thisObject)->impl()); ExceptionCode ec = 0; - imp->setGlyphRef(value->toString(exec), ec); + imp->setGlyphRef(value.toString(exec), ec); setDOMException(exec, ec); } -void setJSSVGAltGlyphElementFormat(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGAltGlyphElementFormat(ExecState* exec, JSObject* thisObject, JSValue value) { SVGAltGlyphElement* imp = static_cast<SVGAltGlyphElement*>(static_cast<JSSVGAltGlyphElement*>(thisObject)->impl()); ExceptionCode ec = 0; - imp->setFormat(value->toString(exec), ec); + imp->setFormat(value.toString(exec), ec); setDOMException(exec, ec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAltGlyphElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAltGlyphElement.h index 79e4660f0d..849854654e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAltGlyphElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAltGlyphElement.h @@ -34,13 +34,13 @@ class JSSVGAltGlyphElement : public JSSVGTextPositioningElement { typedef JSSVGTextPositioningElement Base; public: JSSVGAltGlyphElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAltGlyphElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGAltGlyphElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGAltGlyphElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,11 +59,11 @@ public: // Attributes -JSC::JSValuePtr jsSVGAltGlyphElementGlyphRef(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGAltGlyphElementGlyphRef(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGAltGlyphElementFormat(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGAltGlyphElementFormat(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGAltGlyphElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAltGlyphElementGlyphRef(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGAltGlyphElementGlyphRef(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGAltGlyphElementFormat(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGAltGlyphElementFormat(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGAltGlyphElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAngle.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAngle.cpp index 649613cdc6..190edeaaf9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAngle.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAngle.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAngle) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAngle); /* Hash table */ @@ -84,13 +84,13 @@ public: JSSVGAngleConstructor(ExecState* exec) : DOMObject(JSSVGAngleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGAnglePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGAnglePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -126,9 +126,9 @@ static const HashTable JSSVGAnglePrototypeTable = const ClassInfo JSSVGAnglePrototype::s_info = { "SVGAnglePrototype", 0, &JSSVGAnglePrototypeTable, 0 }; -JSObject* JSSVGAnglePrototype::self(ExecState* exec) +JSObject* JSSVGAnglePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAngle>(exec); + return getDOMPrototype<JSSVGAngle>(exec, globalObject); } bool JSSVGAnglePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -148,12 +148,11 @@ JSSVGAngle::JSSVGAngle(PassRefPtr<Structure> structure, PassRefPtr<SVGAngle> imp JSSVGAngle::~JSSVGAngle() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGAngle::createPrototype(ExecState* exec) +JSObject* JSSVGAngle::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnglePrototype(JSSVGAnglePrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGAnglePrototype(JSSVGAnglePrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGAngle::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -161,56 +160,60 @@ bool JSSVGAngle::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN return getStaticValueSlot<JSSVGAngle, Base>(exec, &JSSVGAngleTable, this, propertyName, slot); } -JSValuePtr jsSVGAngleUnitType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAngleUnitType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAngle* imp = static_cast<SVGAngle*>(static_cast<JSSVGAngle*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->unitType()); } -JSValuePtr jsSVGAngleValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAngleValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAngle* imp = static_cast<SVGAngle*>(static_cast<JSSVGAngle*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->value()); } -JSValuePtr jsSVGAngleValueInSpecifiedUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAngleValueInSpecifiedUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAngle* imp = static_cast<SVGAngle*>(static_cast<JSSVGAngle*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->valueInSpecifiedUnits()); } -JSValuePtr jsSVGAngleValueAsString(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAngleValueAsString(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAngle* imp = static_cast<SVGAngle*>(static_cast<JSSVGAngle*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->valueAsString()); } -JSValuePtr jsSVGAngleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAngleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGAngle*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSSVGAngle::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGAngle::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGAngle, Base>(exec, propertyName, value, &JSSVGAngleTable, this, slot); } -void setJSSVGAngleValue(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGAngleValue(ExecState* exec, JSObject* thisObject, JSValue value) { SVGAngle* imp = static_cast<SVGAngle*>(static_cast<JSSVGAngle*>(thisObject)->impl()); - imp->setValue(value->toFloat(exec)); + imp->setValue(value.toFloat(exec)); if (static_cast<JSSVGAngle*>(thisObject)->context()) static_cast<JSSVGAngle*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGAngle*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGAngleValueInSpecifiedUnits(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGAngleValueInSpecifiedUnits(ExecState* exec, JSObject* thisObject, JSValue value) { SVGAngle* imp = static_cast<SVGAngle*>(static_cast<JSSVGAngle*>(thisObject)->impl()); - imp->setValueInSpecifiedUnits(value->toFloat(exec)); + imp->setValueInSpecifiedUnits(value.toFloat(exec)); if (static_cast<JSSVGAngle*>(thisObject)->context()) static_cast<JSSVGAngle*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGAngle*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGAngleValueAsString(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGAngleValueAsString(ExecState* exec, JSObject* thisObject, JSValue value) { SVGAngle* imp = static_cast<SVGAngle*>(static_cast<JSSVGAngle*>(thisObject)->impl()); imp->setValueAsString(valueToStringWithNullCheck(exec, value)); @@ -218,31 +221,33 @@ void setJSSVGAngleValueAsString(ExecState* exec, JSObject* thisObject, JSValuePt static_cast<JSSVGAngle*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGAngle*>(thisObject)->impl()->associatedAttributeName()); } -JSValuePtr JSSVGAngle::getConstructor(ExecState* exec) +JSValue JSSVGAngle::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGAngleConstructor>(exec); } -JSValuePtr jsSVGAnglePrototypeFunctionNewValueSpecifiedUnits(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGAnglePrototypeFunctionNewValueSpecifiedUnits(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGAngle::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGAngle::s_info)) return throwError(exec, TypeError); JSSVGAngle* castedThisObj = static_cast<JSSVGAngle*>(asObject(thisValue)); SVGAngle* imp = static_cast<SVGAngle*>(castedThisObj->impl()); - unsigned short unitType = args.at(exec, 0)->toInt32(exec); - float valueInSpecifiedUnits = args.at(exec, 1)->toFloat(exec); + unsigned short unitType = args.at(0).toInt32(exec); + float valueInSpecifiedUnits = args.at(1).toFloat(exec); imp->newValueSpecifiedUnits(unitType, valueInSpecifiedUnits); return jsUndefined(); } -JSValuePtr jsSVGAnglePrototypeFunctionConvertToSpecifiedUnits(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGAnglePrototypeFunctionConvertToSpecifiedUnits(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGAngle::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGAngle::s_info)) return throwError(exec, TypeError); JSSVGAngle* castedThisObj = static_cast<JSSVGAngle*>(asObject(thisValue)); SVGAngle* imp = static_cast<SVGAngle*>(castedThisObj->impl()); - unsigned short unitType = args.at(exec, 0)->toInt32(exec); + unsigned short unitType = args.at(0).toInt32(exec); imp->convertToSpecifiedUnits(unitType); return jsUndefined(); @@ -250,38 +255,38 @@ JSValuePtr jsSVGAnglePrototypeFunctionConvertToSpecifiedUnits(ExecState* exec, J // Constant getters -JSValuePtr jsSVGAngleSVG_ANGLETYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGAngleSVG_ANGLETYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGAngleSVG_ANGLETYPE_UNSPECIFIED(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGAngleSVG_ANGLETYPE_UNSPECIFIED(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGAngleSVG_ANGLETYPE_DEG(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGAngleSVG_ANGLETYPE_DEG(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGAngleSVG_ANGLETYPE_RAD(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGAngleSVG_ANGLETYPE_RAD(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsSVGAngleSVG_ANGLETYPE_GRAD(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGAngleSVG_ANGLETYPE_GRAD(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGAngle* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGAngle* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGAngle>(exec, object, context); } -SVGAngle* toSVGAngle(JSC::JSValuePtr value) +SVGAngle* toSVGAngle(JSC::JSValue value) { - return value->isObject(&JSSVGAngle::s_info) ? static_cast<JSSVGAngle*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGAngle::s_info) ? static_cast<JSSVGAngle*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAngle.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAngle.h index f0fad172be..0172d92e04 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAngle.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAngle.h @@ -37,18 +37,18 @@ class JSSVGAngle : public DOMObject { public: JSSVGAngle(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAngle>, SVGElement* context); virtual ~JSSVGAngle(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); SVGAngle* impl() const { return m_impl.get(); } SVGElement* context() const { return m_context.get(); } @@ -57,16 +57,17 @@ private: RefPtr<SVGAngle > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGAngle*, SVGElement* context); -SVGAngle* toSVGAngle(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGAngle*, SVGElement* context); +SVGAngle* toSVGAngle(JSC::JSValue); class JSSVGAnglePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -75,25 +76,25 @@ public: // Functions -JSC::JSValuePtr jsSVGAnglePrototypeFunctionNewValueSpecifiedUnits(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGAnglePrototypeFunctionConvertToSpecifiedUnits(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGAnglePrototypeFunctionNewValueSpecifiedUnits(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGAnglePrototypeFunctionConvertToSpecifiedUnits(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGAngleUnitType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAngleValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGAngleValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGAngleValueInSpecifiedUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGAngleValueInSpecifiedUnits(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGAngleValueAsString(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGAngleValueAsString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGAngleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAngleUnitType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAngleValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGAngleValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGAngleValueInSpecifiedUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGAngleValueInSpecifiedUnits(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGAngleValueAsString(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGAngleValueAsString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGAngleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGAngleSVG_ANGLETYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAngleSVG_ANGLETYPE_UNSPECIFIED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAngleSVG_ANGLETYPE_DEG(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAngleSVG_ANGLETYPE_RAD(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAngleSVG_ANGLETYPE_GRAD(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAngleSVG_ANGLETYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAngleSVG_ANGLETYPE_UNSPECIFIED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAngleSVG_ANGLETYPE_DEG(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAngleSVG_ANGLETYPE_RAD(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAngleSVG_ANGLETYPE_GRAD(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateColorElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateColorElement.cpp index 9f6b3802e5..312836b76e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateColorElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateColorElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimateColorElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimateColorElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGAnimateColorElementPrototypeTable = const ClassInfo JSSVGAnimateColorElementPrototype::s_info = { "SVGAnimateColorElementPrototype", 0, &JSSVGAnimateColorElementPrototypeTable, 0 }; -JSObject* JSSVGAnimateColorElementPrototype::self(ExecState* exec) +JSObject* JSSVGAnimateColorElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAnimateColorElement>(exec); + return getDOMPrototype<JSSVGAnimateColorElement>(exec, globalObject); } const ClassInfo JSSVGAnimateColorElement::s_info = { "SVGAnimateColorElement", &JSSVGAnimationElement::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGAnimateColorElement::JSSVGAnimateColorElement(PassRefPtr<Structure> structu { } -JSObject* JSSVGAnimateColorElement::createPrototype(ExecState* exec) +JSObject* JSSVGAnimateColorElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnimateColorElementPrototype(JSSVGAnimateColorElementPrototype::createStructure(JSSVGAnimationElementPrototype::self(exec))); + return new (exec) JSSVGAnimateColorElementPrototype(JSSVGAnimateColorElementPrototype::createStructure(JSSVGAnimationElementPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateColorElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateColorElement.h index 8c7a3416d4..b2b654a77d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateColorElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateColorElement.h @@ -34,7 +34,7 @@ class JSSVGAnimateColorElement : public JSSVGAnimationElement { typedef JSSVGAnimationElement Base; public: JSSVGAnimateColorElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAnimateColorElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGAnimateColorElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGAnimateColorElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateElement.cpp index b40aad2259..9b57d63790 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimateElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimateElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGAnimateElementPrototypeTable = const ClassInfo JSSVGAnimateElementPrototype::s_info = { "SVGAnimateElementPrototype", 0, &JSSVGAnimateElementPrototypeTable, 0 }; -JSObject* JSSVGAnimateElementPrototype::self(ExecState* exec) +JSObject* JSSVGAnimateElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAnimateElement>(exec); + return getDOMPrototype<JSSVGAnimateElement>(exec, globalObject); } const ClassInfo JSSVGAnimateElement::s_info = { "SVGAnimateElement", &JSSVGAnimationElement::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGAnimateElement::JSSVGAnimateElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSSVGAnimateElement::createPrototype(ExecState* exec) +JSObject* JSSVGAnimateElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnimateElementPrototype(JSSVGAnimateElementPrototype::createStructure(JSSVGAnimationElementPrototype::self(exec))); + return new (exec) JSSVGAnimateElementPrototype(JSSVGAnimateElementPrototype::createStructure(JSSVGAnimationElementPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateElement.h index 818c72108d..0a8e472635 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateElement.h @@ -34,7 +34,7 @@ class JSSVGAnimateElement : public JSSVGAnimationElement { typedef JSSVGAnimationElement Base; public: JSSVGAnimateElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAnimateElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGAnimateElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGAnimateElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateTransformElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateTransformElement.cpp index 07bd771273..cb789f2ccd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateTransformElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateTransformElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimateTransformElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimateTransformElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGAnimateTransformElementPrototypeTable = const ClassInfo JSSVGAnimateTransformElementPrototype::s_info = { "SVGAnimateTransformElementPrototype", 0, &JSSVGAnimateTransformElementPrototypeTable, 0 }; -JSObject* JSSVGAnimateTransformElementPrototype::self(ExecState* exec) +JSObject* JSSVGAnimateTransformElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAnimateTransformElement>(exec); + return getDOMPrototype<JSSVGAnimateTransformElement>(exec, globalObject); } const ClassInfo JSSVGAnimateTransformElement::s_info = { "SVGAnimateTransformElement", &JSSVGAnimationElement::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGAnimateTransformElement::JSSVGAnimateTransformElement(PassRefPtr<Structure> { } -JSObject* JSSVGAnimateTransformElement::createPrototype(ExecState* exec) +JSObject* JSSVGAnimateTransformElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnimateTransformElementPrototype(JSSVGAnimateTransformElementPrototype::createStructure(JSSVGAnimationElementPrototype::self(exec))); + return new (exec) JSSVGAnimateTransformElementPrototype(JSSVGAnimateTransformElementPrototype::createStructure(JSSVGAnimationElementPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateTransformElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateTransformElement.h index 8d3eb5285f..b719266fea 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateTransformElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateTransformElement.h @@ -34,7 +34,7 @@ class JSSVGAnimateTransformElement : public JSSVGAnimationElement { typedef JSSVGAnimationElement Base; public: JSSVGAnimateTransformElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAnimateTransformElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGAnimateTransformElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGAnimateTransformElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedAngle.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedAngle.cpp index ed756e2a3f..5c62b0fda6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedAngle.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedAngle.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedAngle) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedAngle); /* Hash table */ @@ -70,9 +70,9 @@ static const HashTable JSSVGAnimatedAnglePrototypeTable = const ClassInfo JSSVGAnimatedAnglePrototype::s_info = { "SVGAnimatedAnglePrototype", 0, &JSSVGAnimatedAnglePrototypeTable, 0 }; -JSObject* JSSVGAnimatedAnglePrototype::self(ExecState* exec) +JSObject* JSSVGAnimatedAnglePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAnimatedAngle>(exec); + return getDOMPrototype<JSSVGAnimatedAngle>(exec, globalObject); } const ClassInfo JSSVGAnimatedAngle::s_info = { "SVGAnimatedAngle", 0, &JSSVGAnimatedAngleTable, 0 }; @@ -87,12 +87,11 @@ JSSVGAnimatedAngle::JSSVGAnimatedAngle(PassRefPtr<Structure> structure, PassRefP JSSVGAnimatedAngle::~JSSVGAnimatedAngle() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGAnimatedAngle::createPrototype(ExecState* exec) +JSObject* JSSVGAnimatedAngle::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnimatedAnglePrototype(JSSVGAnimatedAnglePrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGAnimatedAnglePrototype(JSSVGAnimatedAnglePrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGAnimatedAngle::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -100,25 +99,27 @@ bool JSSVGAnimatedAngle::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSSVGAnimatedAngle, Base>(exec, &JSSVGAnimatedAngleTable, this, propertyName, slot); } -JSValuePtr jsSVGAnimatedAngleBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedAngleBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedAngle* imp = static_cast<SVGAnimatedAngle*>(static_cast<JSSVGAnimatedAngle*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->baseVal()), static_cast<JSSVGAnimatedAngle*>(asObject(slot.slotBase()))->context()); } -JSValuePtr jsSVGAnimatedAngleAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedAngleAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedAngle* imp = static_cast<SVGAnimatedAngle*>(static_cast<JSSVGAnimatedAngle*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->animVal()), static_cast<JSSVGAnimatedAngle*>(asObject(slot.slotBase()))->context()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGAnimatedAngle* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedAngle* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGAnimatedAngle>(exec, object, context); } -SVGAnimatedAngle* toSVGAnimatedAngle(JSC::JSValuePtr value) +SVGAnimatedAngle* toSVGAnimatedAngle(JSC::JSValue value) { - return value->isObject(&JSSVGAnimatedAngle::s_info) ? static_cast<JSSVGAnimatedAngle*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGAnimatedAngle::s_info) ? static_cast<JSSVGAnimatedAngle*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedAngle.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedAngle.h index 39e530994f..3be190132f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedAngle.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedAngle.h @@ -35,12 +35,12 @@ class JSSVGAnimatedAngle : public DOMObject { public: JSSVGAnimatedAngle(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAnimatedAngle>, SVGElement* context); virtual ~JSSVGAnimatedAngle(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -53,12 +53,13 @@ private: RefPtr<SVGAnimatedAngle > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGAnimatedAngle*, SVGElement* context); -SVGAnimatedAngle* toSVGAnimatedAngle(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedAngle*, SVGElement* context); +SVGAnimatedAngle* toSVGAnimatedAngle(JSC::JSValue); class JSSVGAnimatedAnglePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGAnimatedAnglePrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -66,8 +67,8 @@ public: // Attributes -JSC::JSValuePtr jsSVGAnimatedAngleBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAnimatedAngleAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedAngleBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedAngleAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedBoolean.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedBoolean.cpp index 3955417d48..33301b2917 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedBoolean.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedBoolean.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedBoolean) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedBoolean); /* Hash table */ @@ -68,9 +68,9 @@ static const HashTable JSSVGAnimatedBooleanPrototypeTable = const ClassInfo JSSVGAnimatedBooleanPrototype::s_info = { "SVGAnimatedBooleanPrototype", 0, &JSSVGAnimatedBooleanPrototypeTable, 0 }; -JSObject* JSSVGAnimatedBooleanPrototype::self(ExecState* exec) +JSObject* JSSVGAnimatedBooleanPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAnimatedBoolean>(exec); + return getDOMPrototype<JSSVGAnimatedBoolean>(exec, globalObject); } const ClassInfo JSSVGAnimatedBoolean::s_info = { "SVGAnimatedBoolean", 0, &JSSVGAnimatedBooleanTable, 0 }; @@ -85,12 +85,11 @@ JSSVGAnimatedBoolean::JSSVGAnimatedBoolean(PassRefPtr<Structure> structure, Pass JSSVGAnimatedBoolean::~JSSVGAnimatedBoolean() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGAnimatedBoolean::createPrototype(ExecState* exec) +JSObject* JSSVGAnimatedBoolean::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnimatedBooleanPrototype(JSSVGAnimatedBooleanPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGAnimatedBooleanPrototype(JSSVGAnimatedBooleanPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGAnimatedBoolean::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -98,38 +97,40 @@ bool JSSVGAnimatedBoolean::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGAnimatedBoolean, Base>(exec, &JSSVGAnimatedBooleanTable, this, propertyName, slot); } -JSValuePtr jsSVGAnimatedBooleanBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedBooleanBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedBoolean* imp = static_cast<SVGAnimatedBoolean*>(static_cast<JSSVGAnimatedBoolean*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->baseVal()); } -JSValuePtr jsSVGAnimatedBooleanAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedBooleanAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedBoolean* imp = static_cast<SVGAnimatedBoolean*>(static_cast<JSSVGAnimatedBoolean*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->animVal()); } -void JSSVGAnimatedBoolean::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGAnimatedBoolean::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGAnimatedBoolean, Base>(exec, propertyName, value, &JSSVGAnimatedBooleanTable, this, slot); } -void setJSSVGAnimatedBooleanBaseVal(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGAnimatedBooleanBaseVal(ExecState* exec, JSObject* thisObject, JSValue value) { SVGAnimatedBoolean* imp = static_cast<SVGAnimatedBoolean*>(static_cast<JSSVGAnimatedBoolean*>(thisObject)->impl()); - imp->setBaseVal(value->toBoolean(exec)); + imp->setBaseVal(value.toBoolean(exec)); if (static_cast<JSSVGAnimatedBoolean*>(thisObject)->context()) static_cast<JSSVGAnimatedBoolean*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGAnimatedBoolean*>(thisObject)->impl()->associatedAttributeName()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGAnimatedBoolean* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedBoolean* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGAnimatedBoolean>(exec, object, context); } -SVGAnimatedBoolean* toSVGAnimatedBoolean(JSC::JSValuePtr value) +SVGAnimatedBoolean* toSVGAnimatedBoolean(JSC::JSValue value) { - return value->isObject(&JSSVGAnimatedBoolean::s_info) ? static_cast<JSSVGAnimatedBoolean*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGAnimatedBoolean::s_info) ? static_cast<JSSVGAnimatedBoolean*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedBoolean.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedBoolean.h index 9b58e6cda6..ddebd8aeaa 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedBoolean.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedBoolean.h @@ -35,13 +35,13 @@ class JSSVGAnimatedBoolean : public DOMObject { public: JSSVGAnimatedBoolean(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAnimatedBoolean>, SVGElement* context); virtual ~JSSVGAnimatedBoolean(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -54,12 +54,13 @@ private: RefPtr<SVGAnimatedBoolean > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGAnimatedBoolean*, SVGElement* context); -SVGAnimatedBoolean* toSVGAnimatedBoolean(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedBoolean*, SVGElement* context); +SVGAnimatedBoolean* toSVGAnimatedBoolean(JSC::JSValue); class JSSVGAnimatedBooleanPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGAnimatedBooleanPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -67,9 +68,9 @@ public: // Attributes -JSC::JSValuePtr jsSVGAnimatedBooleanBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGAnimatedBooleanBaseVal(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGAnimatedBooleanAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedBooleanBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGAnimatedBooleanBaseVal(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGAnimatedBooleanAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedEnumeration.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedEnumeration.cpp index be9ae2eea4..ae30a65e1e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedEnumeration.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedEnumeration.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedEnumeration) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedEnumeration); /* Hash table */ @@ -69,9 +69,9 @@ static const HashTable JSSVGAnimatedEnumerationPrototypeTable = const ClassInfo JSSVGAnimatedEnumerationPrototype::s_info = { "SVGAnimatedEnumerationPrototype", 0, &JSSVGAnimatedEnumerationPrototypeTable, 0 }; -JSObject* JSSVGAnimatedEnumerationPrototype::self(ExecState* exec) +JSObject* JSSVGAnimatedEnumerationPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAnimatedEnumeration>(exec); + return getDOMPrototype<JSSVGAnimatedEnumeration>(exec, globalObject); } const ClassInfo JSSVGAnimatedEnumeration::s_info = { "SVGAnimatedEnumeration", 0, &JSSVGAnimatedEnumerationTable, 0 }; @@ -86,12 +86,11 @@ JSSVGAnimatedEnumeration::JSSVGAnimatedEnumeration(PassRefPtr<Structure> structu JSSVGAnimatedEnumeration::~JSSVGAnimatedEnumeration() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGAnimatedEnumeration::createPrototype(ExecState* exec) +JSObject* JSSVGAnimatedEnumeration::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnimatedEnumerationPrototype(JSSVGAnimatedEnumerationPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGAnimatedEnumerationPrototype(JSSVGAnimatedEnumerationPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGAnimatedEnumeration::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -99,38 +98,40 @@ bool JSSVGAnimatedEnumeration::getOwnPropertySlot(ExecState* exec, const Identif return getStaticValueSlot<JSSVGAnimatedEnumeration, Base>(exec, &JSSVGAnimatedEnumerationTable, this, propertyName, slot); } -JSValuePtr jsSVGAnimatedEnumerationBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedEnumerationBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedEnumeration* imp = static_cast<SVGAnimatedEnumeration*>(static_cast<JSSVGAnimatedEnumeration*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->baseVal()); } -JSValuePtr jsSVGAnimatedEnumerationAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedEnumerationAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedEnumeration* imp = static_cast<SVGAnimatedEnumeration*>(static_cast<JSSVGAnimatedEnumeration*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->animVal()); } -void JSSVGAnimatedEnumeration::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGAnimatedEnumeration::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGAnimatedEnumeration, Base>(exec, propertyName, value, &JSSVGAnimatedEnumerationTable, this, slot); } -void setJSSVGAnimatedEnumerationBaseVal(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGAnimatedEnumerationBaseVal(ExecState* exec, JSObject* thisObject, JSValue value) { SVGAnimatedEnumeration* imp = static_cast<SVGAnimatedEnumeration*>(static_cast<JSSVGAnimatedEnumeration*>(thisObject)->impl()); - imp->setBaseVal(value->toInt32(exec)); + imp->setBaseVal(value.toInt32(exec)); if (static_cast<JSSVGAnimatedEnumeration*>(thisObject)->context()) static_cast<JSSVGAnimatedEnumeration*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGAnimatedEnumeration*>(thisObject)->impl()->associatedAttributeName()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGAnimatedEnumeration* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedEnumeration* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGAnimatedEnumeration>(exec, object, context); } -SVGAnimatedEnumeration* toSVGAnimatedEnumeration(JSC::JSValuePtr value) +SVGAnimatedEnumeration* toSVGAnimatedEnumeration(JSC::JSValue value) { - return value->isObject(&JSSVGAnimatedEnumeration::s_info) ? static_cast<JSSVGAnimatedEnumeration*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGAnimatedEnumeration::s_info) ? static_cast<JSSVGAnimatedEnumeration*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedEnumeration.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedEnumeration.h index eaaca25ad8..e09b4f5d9c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedEnumeration.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedEnumeration.h @@ -35,13 +35,13 @@ class JSSVGAnimatedEnumeration : public DOMObject { public: JSSVGAnimatedEnumeration(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAnimatedEnumeration>, SVGElement* context); virtual ~JSSVGAnimatedEnumeration(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -54,12 +54,13 @@ private: RefPtr<SVGAnimatedEnumeration > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGAnimatedEnumeration*, SVGElement* context); -SVGAnimatedEnumeration* toSVGAnimatedEnumeration(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedEnumeration*, SVGElement* context); +SVGAnimatedEnumeration* toSVGAnimatedEnumeration(JSC::JSValue); class JSSVGAnimatedEnumerationPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGAnimatedEnumerationPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -67,9 +68,9 @@ public: // Attributes -JSC::JSValuePtr jsSVGAnimatedEnumerationBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGAnimatedEnumerationBaseVal(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGAnimatedEnumerationAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedEnumerationBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGAnimatedEnumerationBaseVal(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGAnimatedEnumerationAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedInteger.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedInteger.cpp index fad8ff05ff..ebee00bcb3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedInteger.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedInteger.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedInteger) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedInteger); /* Hash table */ @@ -69,9 +69,9 @@ static const HashTable JSSVGAnimatedIntegerPrototypeTable = const ClassInfo JSSVGAnimatedIntegerPrototype::s_info = { "SVGAnimatedIntegerPrototype", 0, &JSSVGAnimatedIntegerPrototypeTable, 0 }; -JSObject* JSSVGAnimatedIntegerPrototype::self(ExecState* exec) +JSObject* JSSVGAnimatedIntegerPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAnimatedInteger>(exec); + return getDOMPrototype<JSSVGAnimatedInteger>(exec, globalObject); } const ClassInfo JSSVGAnimatedInteger::s_info = { "SVGAnimatedInteger", 0, &JSSVGAnimatedIntegerTable, 0 }; @@ -86,12 +86,11 @@ JSSVGAnimatedInteger::JSSVGAnimatedInteger(PassRefPtr<Structure> structure, Pass JSSVGAnimatedInteger::~JSSVGAnimatedInteger() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGAnimatedInteger::createPrototype(ExecState* exec) +JSObject* JSSVGAnimatedInteger::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnimatedIntegerPrototype(JSSVGAnimatedIntegerPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGAnimatedIntegerPrototype(JSSVGAnimatedIntegerPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGAnimatedInteger::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -99,38 +98,40 @@ bool JSSVGAnimatedInteger::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGAnimatedInteger, Base>(exec, &JSSVGAnimatedIntegerTable, this, propertyName, slot); } -JSValuePtr jsSVGAnimatedIntegerBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedIntegerBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedInteger* imp = static_cast<SVGAnimatedInteger*>(static_cast<JSSVGAnimatedInteger*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->baseVal()); } -JSValuePtr jsSVGAnimatedIntegerAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedIntegerAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedInteger* imp = static_cast<SVGAnimatedInteger*>(static_cast<JSSVGAnimatedInteger*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->animVal()); } -void JSSVGAnimatedInteger::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGAnimatedInteger::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGAnimatedInteger, Base>(exec, propertyName, value, &JSSVGAnimatedIntegerTable, this, slot); } -void setJSSVGAnimatedIntegerBaseVal(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGAnimatedIntegerBaseVal(ExecState* exec, JSObject* thisObject, JSValue value) { SVGAnimatedInteger* imp = static_cast<SVGAnimatedInteger*>(static_cast<JSSVGAnimatedInteger*>(thisObject)->impl()); - imp->setBaseVal(value->toInt32(exec)); + imp->setBaseVal(value.toInt32(exec)); if (static_cast<JSSVGAnimatedInteger*>(thisObject)->context()) static_cast<JSSVGAnimatedInteger*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGAnimatedInteger*>(thisObject)->impl()->associatedAttributeName()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGAnimatedInteger* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedInteger* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGAnimatedInteger>(exec, object, context); } -SVGAnimatedInteger* toSVGAnimatedInteger(JSC::JSValuePtr value) +SVGAnimatedInteger* toSVGAnimatedInteger(JSC::JSValue value) { - return value->isObject(&JSSVGAnimatedInteger::s_info) ? static_cast<JSSVGAnimatedInteger*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGAnimatedInteger::s_info) ? static_cast<JSSVGAnimatedInteger*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedInteger.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedInteger.h index f8402d6b3c..5804a92c43 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedInteger.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedInteger.h @@ -35,13 +35,13 @@ class JSSVGAnimatedInteger : public DOMObject { public: JSSVGAnimatedInteger(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAnimatedInteger>, SVGElement* context); virtual ~JSSVGAnimatedInteger(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -54,12 +54,13 @@ private: RefPtr<SVGAnimatedInteger > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGAnimatedInteger*, SVGElement* context); -SVGAnimatedInteger* toSVGAnimatedInteger(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedInteger*, SVGElement* context); +SVGAnimatedInteger* toSVGAnimatedInteger(JSC::JSValue); class JSSVGAnimatedIntegerPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGAnimatedIntegerPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -67,9 +68,9 @@ public: // Attributes -JSC::JSValuePtr jsSVGAnimatedIntegerBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGAnimatedIntegerBaseVal(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGAnimatedIntegerAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedIntegerBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGAnimatedIntegerBaseVal(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGAnimatedIntegerAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLength.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLength.cpp index b6f95ee26c..05de831488 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLength.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLength.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedLength) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedLength); /* Hash table */ @@ -69,9 +69,9 @@ static const HashTable JSSVGAnimatedLengthPrototypeTable = const ClassInfo JSSVGAnimatedLengthPrototype::s_info = { "SVGAnimatedLengthPrototype", 0, &JSSVGAnimatedLengthPrototypeTable, 0 }; -JSObject* JSSVGAnimatedLengthPrototype::self(ExecState* exec) +JSObject* JSSVGAnimatedLengthPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAnimatedLength>(exec); + return getDOMPrototype<JSSVGAnimatedLength>(exec, globalObject); } const ClassInfo JSSVGAnimatedLength::s_info = { "SVGAnimatedLength", 0, &JSSVGAnimatedLengthTable, 0 }; @@ -86,12 +86,11 @@ JSSVGAnimatedLength::JSSVGAnimatedLength(PassRefPtr<Structure> structure, PassRe JSSVGAnimatedLength::~JSSVGAnimatedLength() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGAnimatedLength::createPrototype(ExecState* exec) +JSObject* JSSVGAnimatedLength::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnimatedLengthPrototype(JSSVGAnimatedLengthPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGAnimatedLengthPrototype(JSSVGAnimatedLengthPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGAnimatedLength::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -99,25 +98,27 @@ bool JSSVGAnimatedLength::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGAnimatedLength, Base>(exec, &JSSVGAnimatedLengthTable, this, propertyName, slot); } -JSValuePtr jsSVGAnimatedLengthBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedLengthBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedLength* imp = static_cast<SVGAnimatedLength*>(static_cast<JSSVGAnimatedLength*>(asObject(slot.slotBase()))->impl()); return toJS(exec, JSSVGDynamicPODTypeWrapperCache<SVGLength, SVGAnimatedLength>::lookupOrCreateWrapper(imp, &SVGAnimatedLength::baseVal, &SVGAnimatedLength::setBaseVal).get(), static_cast<JSSVGAnimatedLength*>(asObject(slot.slotBase()))->context()); } -JSValuePtr jsSVGAnimatedLengthAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedLengthAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedLength* imp = static_cast<SVGAnimatedLength*>(static_cast<JSSVGAnimatedLength*>(asObject(slot.slotBase()))->impl()); return toJS(exec, JSSVGDynamicPODTypeWrapperCache<SVGLength, SVGAnimatedLength>::lookupOrCreateWrapper(imp, &SVGAnimatedLength::animVal, &SVGAnimatedLength::setAnimVal).get(), static_cast<JSSVGAnimatedLength*>(asObject(slot.slotBase()))->context()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGAnimatedLength* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedLength* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGAnimatedLength>(exec, object, context); } -SVGAnimatedLength* toSVGAnimatedLength(JSC::JSValuePtr value) +SVGAnimatedLength* toSVGAnimatedLength(JSC::JSValue value) { - return value->isObject(&JSSVGAnimatedLength::s_info) ? static_cast<JSSVGAnimatedLength*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGAnimatedLength::s_info) ? static_cast<JSSVGAnimatedLength*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLength.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLength.h index dd9a6ec90b..5f78e4b441 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLength.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLength.h @@ -35,12 +35,12 @@ class JSSVGAnimatedLength : public DOMObject { public: JSSVGAnimatedLength(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAnimatedLength>, SVGElement* context); virtual ~JSSVGAnimatedLength(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -53,12 +53,13 @@ private: RefPtr<SVGAnimatedLength > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGAnimatedLength*, SVGElement* context); -SVGAnimatedLength* toSVGAnimatedLength(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedLength*, SVGElement* context); +SVGAnimatedLength* toSVGAnimatedLength(JSC::JSValue); class JSSVGAnimatedLengthPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGAnimatedLengthPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -66,8 +67,8 @@ public: // Attributes -JSC::JSValuePtr jsSVGAnimatedLengthBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAnimatedLengthAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedLengthBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedLengthAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLengthList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLengthList.cpp index 31c17e7fd6..2debf2683b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLengthList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLengthList.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedLengthList) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedLengthList); /* Hash table */ @@ -70,9 +70,9 @@ static const HashTable JSSVGAnimatedLengthListPrototypeTable = const ClassInfo JSSVGAnimatedLengthListPrototype::s_info = { "SVGAnimatedLengthListPrototype", 0, &JSSVGAnimatedLengthListPrototypeTable, 0 }; -JSObject* JSSVGAnimatedLengthListPrototype::self(ExecState* exec) +JSObject* JSSVGAnimatedLengthListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAnimatedLengthList>(exec); + return getDOMPrototype<JSSVGAnimatedLengthList>(exec, globalObject); } const ClassInfo JSSVGAnimatedLengthList::s_info = { "SVGAnimatedLengthList", 0, &JSSVGAnimatedLengthListTable, 0 }; @@ -87,12 +87,11 @@ JSSVGAnimatedLengthList::JSSVGAnimatedLengthList(PassRefPtr<Structure> structure JSSVGAnimatedLengthList::~JSSVGAnimatedLengthList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGAnimatedLengthList::createPrototype(ExecState* exec) +JSObject* JSSVGAnimatedLengthList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnimatedLengthListPrototype(JSSVGAnimatedLengthListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGAnimatedLengthListPrototype(JSSVGAnimatedLengthListPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGAnimatedLengthList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -100,25 +99,27 @@ bool JSSVGAnimatedLengthList::getOwnPropertySlot(ExecState* exec, const Identifi return getStaticValueSlot<JSSVGAnimatedLengthList, Base>(exec, &JSSVGAnimatedLengthListTable, this, propertyName, slot); } -JSValuePtr jsSVGAnimatedLengthListBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedLengthListBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedLengthList* imp = static_cast<SVGAnimatedLengthList*>(static_cast<JSSVGAnimatedLengthList*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->baseVal()), static_cast<JSSVGAnimatedLengthList*>(asObject(slot.slotBase()))->context()); } -JSValuePtr jsSVGAnimatedLengthListAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedLengthListAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedLengthList* imp = static_cast<SVGAnimatedLengthList*>(static_cast<JSSVGAnimatedLengthList*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->animVal()), static_cast<JSSVGAnimatedLengthList*>(asObject(slot.slotBase()))->context()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGAnimatedLengthList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedLengthList* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGAnimatedLengthList>(exec, object, context); } -SVGAnimatedLengthList* toSVGAnimatedLengthList(JSC::JSValuePtr value) +SVGAnimatedLengthList* toSVGAnimatedLengthList(JSC::JSValue value) { - return value->isObject(&JSSVGAnimatedLengthList::s_info) ? static_cast<JSSVGAnimatedLengthList*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGAnimatedLengthList::s_info) ? static_cast<JSSVGAnimatedLengthList*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLengthList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLengthList.h index 227ba01cb9..68ff457d61 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLengthList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLengthList.h @@ -35,12 +35,12 @@ class JSSVGAnimatedLengthList : public DOMObject { public: JSSVGAnimatedLengthList(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAnimatedLengthList>, SVGElement* context); virtual ~JSSVGAnimatedLengthList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -53,12 +53,13 @@ private: RefPtr<SVGAnimatedLengthList > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGAnimatedLengthList*, SVGElement* context); -SVGAnimatedLengthList* toSVGAnimatedLengthList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedLengthList*, SVGElement* context); +SVGAnimatedLengthList* toSVGAnimatedLengthList(JSC::JSValue); class JSSVGAnimatedLengthListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGAnimatedLengthListPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -66,8 +67,8 @@ public: // Attributes -JSC::JSValuePtr jsSVGAnimatedLengthListBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAnimatedLengthListAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedLengthListBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedLengthListAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumber.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumber.cpp index dcdf0760d8..d6baa65950 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumber.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumber.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedNumber) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedNumber); /* Hash table */ @@ -69,9 +69,9 @@ static const HashTable JSSVGAnimatedNumberPrototypeTable = const ClassInfo JSSVGAnimatedNumberPrototype::s_info = { "SVGAnimatedNumberPrototype", 0, &JSSVGAnimatedNumberPrototypeTable, 0 }; -JSObject* JSSVGAnimatedNumberPrototype::self(ExecState* exec) +JSObject* JSSVGAnimatedNumberPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAnimatedNumber>(exec); + return getDOMPrototype<JSSVGAnimatedNumber>(exec, globalObject); } const ClassInfo JSSVGAnimatedNumber::s_info = { "SVGAnimatedNumber", 0, &JSSVGAnimatedNumberTable, 0 }; @@ -86,12 +86,11 @@ JSSVGAnimatedNumber::JSSVGAnimatedNumber(PassRefPtr<Structure> structure, PassRe JSSVGAnimatedNumber::~JSSVGAnimatedNumber() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGAnimatedNumber::createPrototype(ExecState* exec) +JSObject* JSSVGAnimatedNumber::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnimatedNumberPrototype(JSSVGAnimatedNumberPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGAnimatedNumberPrototype(JSSVGAnimatedNumberPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGAnimatedNumber::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -99,38 +98,40 @@ bool JSSVGAnimatedNumber::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGAnimatedNumber, Base>(exec, &JSSVGAnimatedNumberTable, this, propertyName, slot); } -JSValuePtr jsSVGAnimatedNumberBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedNumberBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedNumber* imp = static_cast<SVGAnimatedNumber*>(static_cast<JSSVGAnimatedNumber*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->baseVal()); } -JSValuePtr jsSVGAnimatedNumberAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedNumberAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedNumber* imp = static_cast<SVGAnimatedNumber*>(static_cast<JSSVGAnimatedNumber*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->animVal()); } -void JSSVGAnimatedNumber::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGAnimatedNumber::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGAnimatedNumber, Base>(exec, propertyName, value, &JSSVGAnimatedNumberTable, this, slot); } -void setJSSVGAnimatedNumberBaseVal(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGAnimatedNumberBaseVal(ExecState* exec, JSObject* thisObject, JSValue value) { SVGAnimatedNumber* imp = static_cast<SVGAnimatedNumber*>(static_cast<JSSVGAnimatedNumber*>(thisObject)->impl()); - imp->setBaseVal(value->toFloat(exec)); + imp->setBaseVal(value.toFloat(exec)); if (static_cast<JSSVGAnimatedNumber*>(thisObject)->context()) static_cast<JSSVGAnimatedNumber*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGAnimatedNumber*>(thisObject)->impl()->associatedAttributeName()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGAnimatedNumber* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedNumber* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGAnimatedNumber>(exec, object, context); } -SVGAnimatedNumber* toSVGAnimatedNumber(JSC::JSValuePtr value) +SVGAnimatedNumber* toSVGAnimatedNumber(JSC::JSValue value) { - return value->isObject(&JSSVGAnimatedNumber::s_info) ? static_cast<JSSVGAnimatedNumber*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGAnimatedNumber::s_info) ? static_cast<JSSVGAnimatedNumber*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumber.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumber.h index 77590fb964..8e058b85a3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumber.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumber.h @@ -35,13 +35,13 @@ class JSSVGAnimatedNumber : public DOMObject { public: JSSVGAnimatedNumber(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAnimatedNumber>, SVGElement* context); virtual ~JSSVGAnimatedNumber(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -54,12 +54,13 @@ private: RefPtr<SVGAnimatedNumber > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGAnimatedNumber*, SVGElement* context); -SVGAnimatedNumber* toSVGAnimatedNumber(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedNumber*, SVGElement* context); +SVGAnimatedNumber* toSVGAnimatedNumber(JSC::JSValue); class JSSVGAnimatedNumberPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGAnimatedNumberPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -67,9 +68,9 @@ public: // Attributes -JSC::JSValuePtr jsSVGAnimatedNumberBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGAnimatedNumberBaseVal(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGAnimatedNumberAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedNumberBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGAnimatedNumberBaseVal(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGAnimatedNumberAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumberList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumberList.cpp index cd39b16bbb..610ba23004 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumberList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumberList.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedNumberList) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedNumberList); /* Hash table */ @@ -70,9 +70,9 @@ static const HashTable JSSVGAnimatedNumberListPrototypeTable = const ClassInfo JSSVGAnimatedNumberListPrototype::s_info = { "SVGAnimatedNumberListPrototype", 0, &JSSVGAnimatedNumberListPrototypeTable, 0 }; -JSObject* JSSVGAnimatedNumberListPrototype::self(ExecState* exec) +JSObject* JSSVGAnimatedNumberListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAnimatedNumberList>(exec); + return getDOMPrototype<JSSVGAnimatedNumberList>(exec, globalObject); } const ClassInfo JSSVGAnimatedNumberList::s_info = { "SVGAnimatedNumberList", 0, &JSSVGAnimatedNumberListTable, 0 }; @@ -87,12 +87,11 @@ JSSVGAnimatedNumberList::JSSVGAnimatedNumberList(PassRefPtr<Structure> structure JSSVGAnimatedNumberList::~JSSVGAnimatedNumberList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGAnimatedNumberList::createPrototype(ExecState* exec) +JSObject* JSSVGAnimatedNumberList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnimatedNumberListPrototype(JSSVGAnimatedNumberListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGAnimatedNumberListPrototype(JSSVGAnimatedNumberListPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGAnimatedNumberList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -100,25 +99,27 @@ bool JSSVGAnimatedNumberList::getOwnPropertySlot(ExecState* exec, const Identifi return getStaticValueSlot<JSSVGAnimatedNumberList, Base>(exec, &JSSVGAnimatedNumberListTable, this, propertyName, slot); } -JSValuePtr jsSVGAnimatedNumberListBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedNumberListBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedNumberList* imp = static_cast<SVGAnimatedNumberList*>(static_cast<JSSVGAnimatedNumberList*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->baseVal()), static_cast<JSSVGAnimatedNumberList*>(asObject(slot.slotBase()))->context()); } -JSValuePtr jsSVGAnimatedNumberListAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedNumberListAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedNumberList* imp = static_cast<SVGAnimatedNumberList*>(static_cast<JSSVGAnimatedNumberList*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->animVal()), static_cast<JSSVGAnimatedNumberList*>(asObject(slot.slotBase()))->context()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGAnimatedNumberList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedNumberList* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGAnimatedNumberList>(exec, object, context); } -SVGAnimatedNumberList* toSVGAnimatedNumberList(JSC::JSValuePtr value) +SVGAnimatedNumberList* toSVGAnimatedNumberList(JSC::JSValue value) { - return value->isObject(&JSSVGAnimatedNumberList::s_info) ? static_cast<JSSVGAnimatedNumberList*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGAnimatedNumberList::s_info) ? static_cast<JSSVGAnimatedNumberList*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumberList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumberList.h index 15e78883e0..a6d997c3d5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumberList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumberList.h @@ -35,12 +35,12 @@ class JSSVGAnimatedNumberList : public DOMObject { public: JSSVGAnimatedNumberList(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAnimatedNumberList>, SVGElement* context); virtual ~JSSVGAnimatedNumberList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -53,12 +53,13 @@ private: RefPtr<SVGAnimatedNumberList > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGAnimatedNumberList*, SVGElement* context); -SVGAnimatedNumberList* toSVGAnimatedNumberList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedNumberList*, SVGElement* context); +SVGAnimatedNumberList* toSVGAnimatedNumberList(JSC::JSValue); class JSSVGAnimatedNumberListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGAnimatedNumberListPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -66,8 +67,8 @@ public: // Attributes -JSC::JSValuePtr jsSVGAnimatedNumberListBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAnimatedNumberListAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedNumberListBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedNumberListAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedPreserveAspectRatio.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedPreserveAspectRatio.cpp index 04b2e73b0e..5c03cce51a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedPreserveAspectRatio.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedPreserveAspectRatio.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedPreserveAspectRatio) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedPreserveAspectRatio); /* Hash table */ @@ -70,9 +70,9 @@ static const HashTable JSSVGAnimatedPreserveAspectRatioPrototypeTable = const ClassInfo JSSVGAnimatedPreserveAspectRatioPrototype::s_info = { "SVGAnimatedPreserveAspectRatioPrototype", 0, &JSSVGAnimatedPreserveAspectRatioPrototypeTable, 0 }; -JSObject* JSSVGAnimatedPreserveAspectRatioPrototype::self(ExecState* exec) +JSObject* JSSVGAnimatedPreserveAspectRatioPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAnimatedPreserveAspectRatio>(exec); + return getDOMPrototype<JSSVGAnimatedPreserveAspectRatio>(exec, globalObject); } const ClassInfo JSSVGAnimatedPreserveAspectRatio::s_info = { "SVGAnimatedPreserveAspectRatio", 0, &JSSVGAnimatedPreserveAspectRatioTable, 0 }; @@ -87,12 +87,11 @@ JSSVGAnimatedPreserveAspectRatio::JSSVGAnimatedPreserveAspectRatio(PassRefPtr<St JSSVGAnimatedPreserveAspectRatio::~JSSVGAnimatedPreserveAspectRatio() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGAnimatedPreserveAspectRatio::createPrototype(ExecState* exec) +JSObject* JSSVGAnimatedPreserveAspectRatio::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnimatedPreserveAspectRatioPrototype(JSSVGAnimatedPreserveAspectRatioPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGAnimatedPreserveAspectRatioPrototype(JSSVGAnimatedPreserveAspectRatioPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGAnimatedPreserveAspectRatio::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -100,25 +99,27 @@ bool JSSVGAnimatedPreserveAspectRatio::getOwnPropertySlot(ExecState* exec, const return getStaticValueSlot<JSSVGAnimatedPreserveAspectRatio, Base>(exec, &JSSVGAnimatedPreserveAspectRatioTable, this, propertyName, slot); } -JSValuePtr jsSVGAnimatedPreserveAspectRatioBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedPreserveAspectRatioBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedPreserveAspectRatio* imp = static_cast<SVGAnimatedPreserveAspectRatio*>(static_cast<JSSVGAnimatedPreserveAspectRatio*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->baseVal()), static_cast<JSSVGAnimatedPreserveAspectRatio*>(asObject(slot.slotBase()))->context()); } -JSValuePtr jsSVGAnimatedPreserveAspectRatioAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedPreserveAspectRatioAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedPreserveAspectRatio* imp = static_cast<SVGAnimatedPreserveAspectRatio*>(static_cast<JSSVGAnimatedPreserveAspectRatio*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->animVal()), static_cast<JSSVGAnimatedPreserveAspectRatio*>(asObject(slot.slotBase()))->context()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGAnimatedPreserveAspectRatio* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedPreserveAspectRatio* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGAnimatedPreserveAspectRatio>(exec, object, context); } -SVGAnimatedPreserveAspectRatio* toSVGAnimatedPreserveAspectRatio(JSC::JSValuePtr value) +SVGAnimatedPreserveAspectRatio* toSVGAnimatedPreserveAspectRatio(JSC::JSValue value) { - return value->isObject(&JSSVGAnimatedPreserveAspectRatio::s_info) ? static_cast<JSSVGAnimatedPreserveAspectRatio*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGAnimatedPreserveAspectRatio::s_info) ? static_cast<JSSVGAnimatedPreserveAspectRatio*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedPreserveAspectRatio.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedPreserveAspectRatio.h index 05bcb19d10..f74ae85edc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedPreserveAspectRatio.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedPreserveAspectRatio.h @@ -35,12 +35,12 @@ class JSSVGAnimatedPreserveAspectRatio : public DOMObject { public: JSSVGAnimatedPreserveAspectRatio(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAnimatedPreserveAspectRatio>, SVGElement* context); virtual ~JSSVGAnimatedPreserveAspectRatio(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -53,12 +53,13 @@ private: RefPtr<SVGAnimatedPreserveAspectRatio > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGAnimatedPreserveAspectRatio*, SVGElement* context); -SVGAnimatedPreserveAspectRatio* toSVGAnimatedPreserveAspectRatio(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedPreserveAspectRatio*, SVGElement* context); +SVGAnimatedPreserveAspectRatio* toSVGAnimatedPreserveAspectRatio(JSC::JSValue); class JSSVGAnimatedPreserveAspectRatioPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGAnimatedPreserveAspectRatioPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -66,8 +67,8 @@ public: // Attributes -JSC::JSValuePtr jsSVGAnimatedPreserveAspectRatioBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAnimatedPreserveAspectRatioAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedPreserveAspectRatioBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedPreserveAspectRatioAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedRect.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedRect.cpp index 59ff2d17c1..dfe079580b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedRect.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedRect.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedRect) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedRect); /* Hash table */ @@ -70,9 +70,9 @@ static const HashTable JSSVGAnimatedRectPrototypeTable = const ClassInfo JSSVGAnimatedRectPrototype::s_info = { "SVGAnimatedRectPrototype", 0, &JSSVGAnimatedRectPrototypeTable, 0 }; -JSObject* JSSVGAnimatedRectPrototype::self(ExecState* exec) +JSObject* JSSVGAnimatedRectPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAnimatedRect>(exec); + return getDOMPrototype<JSSVGAnimatedRect>(exec, globalObject); } const ClassInfo JSSVGAnimatedRect::s_info = { "SVGAnimatedRect", 0, &JSSVGAnimatedRectTable, 0 }; @@ -87,12 +87,11 @@ JSSVGAnimatedRect::JSSVGAnimatedRect(PassRefPtr<Structure> structure, PassRefPtr JSSVGAnimatedRect::~JSSVGAnimatedRect() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGAnimatedRect::createPrototype(ExecState* exec) +JSObject* JSSVGAnimatedRect::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnimatedRectPrototype(JSSVGAnimatedRectPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGAnimatedRectPrototype(JSSVGAnimatedRectPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGAnimatedRect::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -100,25 +99,27 @@ bool JSSVGAnimatedRect::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSSVGAnimatedRect, Base>(exec, &JSSVGAnimatedRectTable, this, propertyName, slot); } -JSValuePtr jsSVGAnimatedRectBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedRectBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedRect* imp = static_cast<SVGAnimatedRect*>(static_cast<JSSVGAnimatedRect*>(asObject(slot.slotBase()))->impl()); return toJS(exec, JSSVGDynamicPODTypeWrapperCache<FloatRect, SVGAnimatedRect>::lookupOrCreateWrapper(imp, &SVGAnimatedRect::baseVal, &SVGAnimatedRect::setBaseVal).get(), static_cast<JSSVGAnimatedRect*>(asObject(slot.slotBase()))->context()); } -JSValuePtr jsSVGAnimatedRectAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedRectAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedRect* imp = static_cast<SVGAnimatedRect*>(static_cast<JSSVGAnimatedRect*>(asObject(slot.slotBase()))->impl()); return toJS(exec, JSSVGDynamicPODTypeWrapperCache<FloatRect, SVGAnimatedRect>::lookupOrCreateWrapper(imp, &SVGAnimatedRect::animVal, &SVGAnimatedRect::setAnimVal).get(), static_cast<JSSVGAnimatedRect*>(asObject(slot.slotBase()))->context()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGAnimatedRect* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedRect* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGAnimatedRect>(exec, object, context); } -SVGAnimatedRect* toSVGAnimatedRect(JSC::JSValuePtr value) +SVGAnimatedRect* toSVGAnimatedRect(JSC::JSValue value) { - return value->isObject(&JSSVGAnimatedRect::s_info) ? static_cast<JSSVGAnimatedRect*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGAnimatedRect::s_info) ? static_cast<JSSVGAnimatedRect*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedRect.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedRect.h index 55b9ed37c5..909f7db2ad 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedRect.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedRect.h @@ -35,12 +35,12 @@ class JSSVGAnimatedRect : public DOMObject { public: JSSVGAnimatedRect(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAnimatedRect>, SVGElement* context); virtual ~JSSVGAnimatedRect(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -53,12 +53,13 @@ private: RefPtr<SVGAnimatedRect > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGAnimatedRect*, SVGElement* context); -SVGAnimatedRect* toSVGAnimatedRect(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedRect*, SVGElement* context); +SVGAnimatedRect* toSVGAnimatedRect(JSC::JSValue); class JSSVGAnimatedRectPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGAnimatedRectPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -66,8 +67,8 @@ public: // Attributes -JSC::JSValuePtr jsSVGAnimatedRectBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAnimatedRectAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedRectBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedRectAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedString.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedString.cpp index e35e918305..0088054861 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedString.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedString.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedString) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedString); /* Hash table */ @@ -71,9 +71,9 @@ static const HashTable JSSVGAnimatedStringPrototypeTable = const ClassInfo JSSVGAnimatedStringPrototype::s_info = { "SVGAnimatedStringPrototype", 0, &JSSVGAnimatedStringPrototypeTable, 0 }; -JSObject* JSSVGAnimatedStringPrototype::self(ExecState* exec) +JSObject* JSSVGAnimatedStringPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAnimatedString>(exec); + return getDOMPrototype<JSSVGAnimatedString>(exec, globalObject); } const ClassInfo JSSVGAnimatedString::s_info = { "SVGAnimatedString", 0, &JSSVGAnimatedStringTable, 0 }; @@ -88,12 +88,11 @@ JSSVGAnimatedString::JSSVGAnimatedString(PassRefPtr<Structure> structure, PassRe JSSVGAnimatedString::~JSSVGAnimatedString() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGAnimatedString::createPrototype(ExecState* exec) +JSObject* JSSVGAnimatedString::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnimatedStringPrototype(JSSVGAnimatedStringPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGAnimatedStringPrototype(JSSVGAnimatedStringPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGAnimatedString::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -101,38 +100,40 @@ bool JSSVGAnimatedString::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGAnimatedString, Base>(exec, &JSSVGAnimatedStringTable, this, propertyName, slot); } -JSValuePtr jsSVGAnimatedStringBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedStringBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedString* imp = static_cast<SVGAnimatedString*>(static_cast<JSSVGAnimatedString*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->baseVal()); } -JSValuePtr jsSVGAnimatedStringAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedStringAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedString* imp = static_cast<SVGAnimatedString*>(static_cast<JSSVGAnimatedString*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->animVal()); } -void JSSVGAnimatedString::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGAnimatedString::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGAnimatedString, Base>(exec, propertyName, value, &JSSVGAnimatedStringTable, this, slot); } -void setJSSVGAnimatedStringBaseVal(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGAnimatedStringBaseVal(ExecState* exec, JSObject* thisObject, JSValue value) { SVGAnimatedString* imp = static_cast<SVGAnimatedString*>(static_cast<JSSVGAnimatedString*>(thisObject)->impl()); - imp->setBaseVal(value->toString(exec)); + imp->setBaseVal(value.toString(exec)); if (static_cast<JSSVGAnimatedString*>(thisObject)->context()) static_cast<JSSVGAnimatedString*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGAnimatedString*>(thisObject)->impl()->associatedAttributeName()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGAnimatedString* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedString* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGAnimatedString>(exec, object, context); } -SVGAnimatedString* toSVGAnimatedString(JSC::JSValuePtr value) +SVGAnimatedString* toSVGAnimatedString(JSC::JSValue value) { - return value->isObject(&JSSVGAnimatedString::s_info) ? static_cast<JSSVGAnimatedString*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGAnimatedString::s_info) ? static_cast<JSSVGAnimatedString*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedString.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedString.h index 71bf12d496..d95a8fe19b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedString.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedString.h @@ -35,13 +35,13 @@ class JSSVGAnimatedString : public DOMObject { public: JSSVGAnimatedString(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAnimatedString>, SVGElement* context); virtual ~JSSVGAnimatedString(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -54,12 +54,13 @@ private: RefPtr<SVGAnimatedString > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGAnimatedString*, SVGElement* context); -SVGAnimatedString* toSVGAnimatedString(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedString*, SVGElement* context); +SVGAnimatedString* toSVGAnimatedString(JSC::JSValue); class JSSVGAnimatedStringPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGAnimatedStringPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -67,9 +68,9 @@ public: // Attributes -JSC::JSValuePtr jsSVGAnimatedStringBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGAnimatedStringBaseVal(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGAnimatedStringAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedStringBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGAnimatedStringBaseVal(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGAnimatedStringAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedTransformList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedTransformList.cpp index bf28b97000..8c9b0ef7dd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedTransformList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedTransformList.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedTransformList) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimatedTransformList); /* Hash table */ @@ -70,9 +70,9 @@ static const HashTable JSSVGAnimatedTransformListPrototypeTable = const ClassInfo JSSVGAnimatedTransformListPrototype::s_info = { "SVGAnimatedTransformListPrototype", 0, &JSSVGAnimatedTransformListPrototypeTable, 0 }; -JSObject* JSSVGAnimatedTransformListPrototype::self(ExecState* exec) +JSObject* JSSVGAnimatedTransformListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAnimatedTransformList>(exec); + return getDOMPrototype<JSSVGAnimatedTransformList>(exec, globalObject); } const ClassInfo JSSVGAnimatedTransformList::s_info = { "SVGAnimatedTransformList", 0, &JSSVGAnimatedTransformListTable, 0 }; @@ -87,12 +87,11 @@ JSSVGAnimatedTransformList::JSSVGAnimatedTransformList(PassRefPtr<Structure> str JSSVGAnimatedTransformList::~JSSVGAnimatedTransformList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGAnimatedTransformList::createPrototype(ExecState* exec) +JSObject* JSSVGAnimatedTransformList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnimatedTransformListPrototype(JSSVGAnimatedTransformListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGAnimatedTransformListPrototype(JSSVGAnimatedTransformListPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGAnimatedTransformList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -100,25 +99,27 @@ bool JSSVGAnimatedTransformList::getOwnPropertySlot(ExecState* exec, const Ident return getStaticValueSlot<JSSVGAnimatedTransformList, Base>(exec, &JSSVGAnimatedTransformListTable, this, propertyName, slot); } -JSValuePtr jsSVGAnimatedTransformListBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedTransformListBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedTransformList* imp = static_cast<SVGAnimatedTransformList*>(static_cast<JSSVGAnimatedTransformList*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->baseVal()), static_cast<JSSVGAnimatedTransformList*>(asObject(slot.slotBase()))->context()); } -JSValuePtr jsSVGAnimatedTransformListAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimatedTransformListAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimatedTransformList* imp = static_cast<SVGAnimatedTransformList*>(static_cast<JSSVGAnimatedTransformList*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->animVal()), static_cast<JSSVGAnimatedTransformList*>(asObject(slot.slotBase()))->context()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGAnimatedTransformList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedTransformList* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGAnimatedTransformList>(exec, object, context); } -SVGAnimatedTransformList* toSVGAnimatedTransformList(JSC::JSValuePtr value) +SVGAnimatedTransformList* toSVGAnimatedTransformList(JSC::JSValue value) { - return value->isObject(&JSSVGAnimatedTransformList::s_info) ? static_cast<JSSVGAnimatedTransformList*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGAnimatedTransformList::s_info) ? static_cast<JSSVGAnimatedTransformList*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedTransformList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedTransformList.h index bd96456645..c3300afbc6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedTransformList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedTransformList.h @@ -35,12 +35,12 @@ class JSSVGAnimatedTransformList : public DOMObject { public: JSSVGAnimatedTransformList(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAnimatedTransformList>, SVGElement* context); virtual ~JSSVGAnimatedTransformList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -53,12 +53,13 @@ private: RefPtr<SVGAnimatedTransformList > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGAnimatedTransformList*, SVGElement* context); -SVGAnimatedTransformList* toSVGAnimatedTransformList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedTransformList*, SVGElement* context); +SVGAnimatedTransformList* toSVGAnimatedTransformList(JSC::JSValue); class JSSVGAnimatedTransformListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGAnimatedTransformListPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -66,8 +67,8 @@ public: // Attributes -JSC::JSValuePtr jsSVGAnimatedTransformListBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAnimatedTransformListAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedTransformListBaseVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimatedTransformListAnimVal(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimationElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimationElement.cpp index 6f22756089..d133b038d3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimationElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimationElement.cpp @@ -42,7 +42,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimationElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGAnimationElement); /* Hash table */ @@ -87,9 +87,9 @@ static const HashTable JSSVGAnimationElementPrototypeTable = const ClassInfo JSSVGAnimationElementPrototype::s_info = { "SVGAnimationElementPrototype", 0, &JSSVGAnimationElementPrototypeTable, 0 }; -JSObject* JSSVGAnimationElementPrototype::self(ExecState* exec) +JSObject* JSSVGAnimationElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGAnimationElement>(exec); + return getDOMPrototype<JSSVGAnimationElement>(exec, globalObject); } bool JSSVGAnimationElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -104,9 +104,9 @@ JSSVGAnimationElement::JSSVGAnimationElement(PassRefPtr<Structure> structure, Pa { } -JSObject* JSSVGAnimationElement::createPrototype(ExecState* exec) +JSObject* JSSVGAnimationElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGAnimationElementPrototype(JSSVGAnimationElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGAnimationElementPrototype(JSSVGAnimationElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGAnimationElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -114,142 +114,155 @@ bool JSSVGAnimationElement::getOwnPropertySlot(ExecState* exec, const Identifier return getStaticValueSlot<JSSVGAnimationElement, Base>(exec, &JSSVGAnimationElementTable, this, propertyName, slot); } -JSValuePtr jsSVGAnimationElementTargetElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimationElementTargetElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimationElement* imp = static_cast<SVGAnimationElement*>(static_cast<JSSVGAnimationElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->targetElement())); } -JSValuePtr jsSVGAnimationElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimationElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimationElement* imp = static_cast<SVGAnimationElement*>(static_cast<JSSVGAnimationElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGAnimationElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimationElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimationElement* imp = static_cast<SVGAnimationElement*>(static_cast<JSSVGAnimationElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGAnimationElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimationElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimationElement* imp = static_cast<SVGAnimationElement*>(static_cast<JSSVGAnimationElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGAnimationElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGAnimationElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGAnimationElement* imp = static_cast<SVGAnimationElement*>(static_cast<JSSVGAnimationElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGAnimationElementPrototypeFunctionGetStartTime(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionGetStartTime(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGAnimationElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGAnimationElement::s_info)) return throwError(exec, TypeError); JSSVGAnimationElement* castedThisObj = static_cast<JSSVGAnimationElement*>(asObject(thisValue)); SVGAnimationElement* imp = static_cast<SVGAnimationElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsNumber(exec, imp->getStartTime()); + JSC::JSValue result = jsNumber(exec, imp->getStartTime()); return result; } -JSValuePtr jsSVGAnimationElementPrototypeFunctionGetCurrentTime(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionGetCurrentTime(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGAnimationElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGAnimationElement::s_info)) return throwError(exec, TypeError); JSSVGAnimationElement* castedThisObj = static_cast<JSSVGAnimationElement*>(asObject(thisValue)); SVGAnimationElement* imp = static_cast<SVGAnimationElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsNumber(exec, imp->getCurrentTime()); + JSC::JSValue result = jsNumber(exec, imp->getCurrentTime()); return result; } -JSValuePtr jsSVGAnimationElementPrototypeFunctionGetSimpleDuration(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionGetSimpleDuration(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGAnimationElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGAnimationElement::s_info)) return throwError(exec, TypeError); JSSVGAnimationElement* castedThisObj = static_cast<JSSVGAnimationElement*>(asObject(thisValue)); SVGAnimationElement* imp = static_cast<SVGAnimationElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - JSC::JSValuePtr result = jsNumber(exec, imp->getSimpleDuration(ec)); + JSC::JSValue result = jsNumber(exec, imp->getSimpleDuration(ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGAnimationElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGAnimationElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGAnimationElement::s_info)) return throwError(exec, TypeError); JSSVGAnimationElement* castedThisObj = static_cast<JSSVGAnimationElement*>(asObject(thisValue)); SVGAnimationElement* imp = static_cast<SVGAnimationElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGAnimationElementPrototypeFunctionBeginElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionBeginElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGAnimationElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGAnimationElement::s_info)) return throwError(exec, TypeError); JSSVGAnimationElement* castedThisObj = static_cast<JSSVGAnimationElement*>(asObject(thisValue)); SVGAnimationElement* imp = static_cast<SVGAnimationElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - JSC::JSValuePtr result = jsBoolean(imp->beginElement(ec)); + JSC::JSValue result = jsBoolean(imp->beginElement(ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGAnimationElementPrototypeFunctionBeginElementAt(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionBeginElementAt(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGAnimationElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGAnimationElement::s_info)) return throwError(exec, TypeError); JSSVGAnimationElement* castedThisObj = static_cast<JSSVGAnimationElement*>(asObject(thisValue)); SVGAnimationElement* imp = static_cast<SVGAnimationElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - float offset = args.at(exec, 0)->toFloat(exec); + float offset = args.at(0).toFloat(exec); - JSC::JSValuePtr result = jsBoolean(imp->beginElementAt(offset, ec)); + JSC::JSValue result = jsBoolean(imp->beginElementAt(offset, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGAnimationElementPrototypeFunctionEndElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionEndElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGAnimationElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGAnimationElement::s_info)) return throwError(exec, TypeError); JSSVGAnimationElement* castedThisObj = static_cast<JSSVGAnimationElement*>(asObject(thisValue)); SVGAnimationElement* imp = static_cast<SVGAnimationElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - JSC::JSValuePtr result = jsBoolean(imp->endElement(ec)); + JSC::JSValue result = jsBoolean(imp->endElement(ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGAnimationElementPrototypeFunctionEndElementAt(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionEndElementAt(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGAnimationElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGAnimationElement::s_info)) return throwError(exec, TypeError); JSSVGAnimationElement* castedThisObj = static_cast<JSSVGAnimationElement*>(asObject(thisValue)); SVGAnimationElement* imp = static_cast<SVGAnimationElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - float offset = args.at(exec, 0)->toFloat(exec); + float offset = args.at(0).toFloat(exec); - JSC::JSValuePtr result = jsBoolean(imp->endElementAt(offset, ec)); + JSC::JSValue result = jsBoolean(imp->endElementAt(offset, ec)); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimationElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimationElement.h index d2390e6807..5bed840895 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimationElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimationElement.h @@ -34,12 +34,12 @@ class JSSVGAnimationElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGAnimationElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGAnimationElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,12 +48,13 @@ public: class JSSVGAnimationElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -62,21 +63,21 @@ public: // Functions -JSC::JSValuePtr jsSVGAnimationElementPrototypeFunctionGetStartTime(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGAnimationElementPrototypeFunctionGetCurrentTime(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGAnimationElementPrototypeFunctionGetSimpleDuration(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGAnimationElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGAnimationElementPrototypeFunctionBeginElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGAnimationElementPrototypeFunctionBeginElementAt(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGAnimationElementPrototypeFunctionEndElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGAnimationElementPrototypeFunctionEndElementAt(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionGetStartTime(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionGetCurrentTime(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionGetSimpleDuration(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionBeginElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionBeginElementAt(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionEndElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionEndElementAt(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGAnimationElementTargetElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAnimationElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAnimationElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAnimationElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGAnimationElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimationElementTargetElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimationElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimationElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimationElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGAnimationElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGCircleElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGCircleElement.cpp index f8d80691dd..0c2fe13996 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGCircleElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGCircleElement.cpp @@ -53,7 +53,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGCircleElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGCircleElement); /* Hash table */ @@ -105,9 +105,9 @@ static const HashTable JSSVGCircleElementPrototypeTable = const ClassInfo JSSVGCircleElementPrototype::s_info = { "SVGCircleElementPrototype", 0, &JSSVGCircleElementPrototypeTable, 0 }; -JSObject* JSSVGCircleElementPrototype::self(ExecState* exec) +JSObject* JSSVGCircleElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGCircleElement>(exec); + return getDOMPrototype<JSSVGCircleElement>(exec, globalObject); } bool JSSVGCircleElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -122,9 +122,9 @@ JSSVGCircleElement::JSSVGCircleElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSSVGCircleElement::createPrototype(ExecState* exec) +JSObject* JSSVGCircleElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGCircleElementPrototype(JSSVGCircleElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGCircleElementPrototype(JSSVGCircleElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGCircleElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -132,186 +132,206 @@ bool JSSVGCircleElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSSVGCircleElement, Base>(exec, &JSSVGCircleElementTable, this, propertyName, slot); } -JSValuePtr jsSVGCircleElementCx(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCircleElementCx(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCircleElement* imp = static_cast<SVGCircleElement*>(static_cast<JSSVGCircleElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->cxAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGCircleElementCy(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCircleElementCy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCircleElement* imp = static_cast<SVGCircleElement*>(static_cast<JSSVGCircleElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->cyAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGCircleElementR(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCircleElementR(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCircleElement* imp = static_cast<SVGCircleElement*>(static_cast<JSSVGCircleElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->rAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGCircleElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCircleElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCircleElement* imp = static_cast<SVGCircleElement*>(static_cast<JSSVGCircleElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGCircleElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCircleElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCircleElement* imp = static_cast<SVGCircleElement*>(static_cast<JSSVGCircleElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGCircleElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCircleElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCircleElement* imp = static_cast<SVGCircleElement*>(static_cast<JSSVGCircleElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGCircleElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCircleElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCircleElement* imp = static_cast<SVGCircleElement*>(static_cast<JSSVGCircleElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGCircleElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCircleElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCircleElement* imp = static_cast<SVGCircleElement*>(static_cast<JSSVGCircleElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGCircleElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCircleElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCircleElement* imp = static_cast<SVGCircleElement*>(static_cast<JSSVGCircleElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGCircleElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCircleElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCircleElement* imp = static_cast<SVGCircleElement*>(static_cast<JSSVGCircleElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGCircleElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCircleElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCircleElement* imp = static_cast<SVGCircleElement*>(static_cast<JSSVGCircleElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGCircleElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCircleElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCircleElement* imp = static_cast<SVGCircleElement*>(static_cast<JSSVGCircleElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->transformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGCircleElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCircleElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCircleElement* imp = static_cast<SVGCircleElement*>(static_cast<JSSVGCircleElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGCircleElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCircleElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCircleElement* imp = static_cast<SVGCircleElement*>(static_cast<JSSVGCircleElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -void JSSVGCircleElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGCircleElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGCircleElement, Base>(exec, propertyName, value, &JSSVGCircleElementTable, this, slot); } -void setJSSVGCircleElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGCircleElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGCircleElement* imp = static_cast<SVGCircleElement*>(static_cast<JSSVGCircleElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGCircleElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGCircleElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGCircleElement* imp = static_cast<SVGCircleElement*>(static_cast<JSSVGCircleElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGCircleElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGCircleElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGCircleElement::s_info)) return throwError(exec, TypeError); JSSVGCircleElement* castedThisObj = static_cast<JSSVGCircleElement*>(asObject(thisValue)); SVGCircleElement* imp = static_cast<SVGCircleElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGCircleElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGCircleElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGCircleElement::s_info)) return throwError(exec, TypeError); JSSVGCircleElement* castedThisObj = static_cast<JSSVGCircleElement*>(asObject(thisValue)); SVGCircleElement* imp = static_cast<SVGCircleElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } -JSValuePtr jsSVGCircleElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGCircleElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGCircleElement::s_info)) return throwError(exec, TypeError); JSSVGCircleElement* castedThisObj = static_cast<JSSVGCircleElement*>(asObject(thisValue)); SVGCircleElement* imp = static_cast<SVGCircleElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGCircleElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGCircleElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGCircleElement::s_info)) return throwError(exec, TypeError); JSSVGCircleElement* castedThisObj = static_cast<JSSVGCircleElement*>(asObject(thisValue)); SVGCircleElement* imp = static_cast<SVGCircleElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGCircleElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGCircleElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGCircleElement::s_info)) return throwError(exec, TypeError); JSSVGCircleElement* castedThisObj = static_cast<JSSVGCircleElement*>(asObject(thisValue)); SVGCircleElement* imp = static_cast<SVGCircleElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGCircleElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGCircleElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGCircleElement::s_info)) return throwError(exec, TypeError); JSSVGCircleElement* castedThisObj = static_cast<JSSVGCircleElement*>(asObject(thisValue)); SVGCircleElement* imp = static_cast<SVGCircleElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGCircleElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGCircleElement.h index 13e9fc0e56..a9d797d3d9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGCircleElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGCircleElement.h @@ -34,13 +34,13 @@ class JSSVGCircleElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGCircleElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGCircleElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGCircleElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,30 +64,30 @@ public: // Functions -JSC::JSValuePtr jsSVGCircleElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGCircleElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGCircleElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGCircleElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGCircleElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGCircleElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGCircleElementCx(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCircleElementCy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCircleElementR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCircleElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCircleElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCircleElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCircleElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGCircleElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGCircleElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGCircleElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGCircleElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCircleElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCircleElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCircleElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCircleElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCircleElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCircleElementCx(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCircleElementCy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCircleElementR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCircleElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCircleElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCircleElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCircleElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGCircleElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGCircleElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGCircleElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGCircleElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCircleElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCircleElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCircleElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCircleElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCircleElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGClipPathElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGClipPathElement.cpp index f96a8c768e..39b04edce9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGClipPathElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGClipPathElement.cpp @@ -53,7 +53,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGClipPathElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGClipPathElement); /* Hash table */ @@ -103,9 +103,9 @@ static const HashTable JSSVGClipPathElementPrototypeTable = const ClassInfo JSSVGClipPathElementPrototype::s_info = { "SVGClipPathElementPrototype", 0, &JSSVGClipPathElementPrototypeTable, 0 }; -JSObject* JSSVGClipPathElementPrototype::self(ExecState* exec) +JSObject* JSSVGClipPathElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGClipPathElement>(exec); + return getDOMPrototype<JSSVGClipPathElement>(exec, globalObject); } bool JSSVGClipPathElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -120,9 +120,9 @@ JSSVGClipPathElement::JSSVGClipPathElement(PassRefPtr<Structure> structure, Pass { } -JSObject* JSSVGClipPathElement::createPrototype(ExecState* exec) +JSObject* JSSVGClipPathElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGClipPathElementPrototype(JSSVGClipPathElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGClipPathElementPrototype(JSSVGClipPathElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGClipPathElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -130,172 +130,190 @@ bool JSSVGClipPathElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGClipPathElement, Base>(exec, &JSSVGClipPathElementTable, this, propertyName, slot); } -JSValuePtr jsSVGClipPathElementClipPathUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGClipPathElementClipPathUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(static_cast<JSSVGClipPathElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->clipPathUnitsAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGClipPathElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGClipPathElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(static_cast<JSSVGClipPathElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGClipPathElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGClipPathElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(static_cast<JSSVGClipPathElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGClipPathElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGClipPathElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(static_cast<JSSVGClipPathElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGClipPathElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGClipPathElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(static_cast<JSSVGClipPathElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGClipPathElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGClipPathElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(static_cast<JSSVGClipPathElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGClipPathElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGClipPathElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(static_cast<JSSVGClipPathElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGClipPathElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGClipPathElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(static_cast<JSSVGClipPathElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGClipPathElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGClipPathElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(static_cast<JSSVGClipPathElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGClipPathElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGClipPathElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(static_cast<JSSVGClipPathElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->transformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGClipPathElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGClipPathElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(static_cast<JSSVGClipPathElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGClipPathElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGClipPathElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(static_cast<JSSVGClipPathElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -void JSSVGClipPathElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGClipPathElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGClipPathElement, Base>(exec, propertyName, value, &JSSVGClipPathElementTable, this, slot); } -void setJSSVGClipPathElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGClipPathElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(static_cast<JSSVGClipPathElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGClipPathElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGClipPathElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(static_cast<JSSVGClipPathElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGClipPathElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGClipPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGClipPathElement::s_info)) return throwError(exec, TypeError); JSSVGClipPathElement* castedThisObj = static_cast<JSSVGClipPathElement*>(asObject(thisValue)); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGClipPathElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGClipPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGClipPathElement::s_info)) return throwError(exec, TypeError); JSSVGClipPathElement* castedThisObj = static_cast<JSSVGClipPathElement*>(asObject(thisValue)); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } -JSValuePtr jsSVGClipPathElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGClipPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGClipPathElement::s_info)) return throwError(exec, TypeError); JSSVGClipPathElement* castedThisObj = static_cast<JSSVGClipPathElement*>(asObject(thisValue)); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGClipPathElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGClipPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGClipPathElement::s_info)) return throwError(exec, TypeError); JSSVGClipPathElement* castedThisObj = static_cast<JSSVGClipPathElement*>(asObject(thisValue)); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGClipPathElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGClipPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGClipPathElement::s_info)) return throwError(exec, TypeError); JSSVGClipPathElement* castedThisObj = static_cast<JSSVGClipPathElement*>(asObject(thisValue)); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGClipPathElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGClipPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGClipPathElement::s_info)) return throwError(exec, TypeError); JSSVGClipPathElement* castedThisObj = static_cast<JSSVGClipPathElement*>(asObject(thisValue)); SVGClipPathElement* imp = static_cast<SVGClipPathElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGClipPathElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGClipPathElement.h index 144d8e26f3..97fe6a0cdc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGClipPathElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGClipPathElement.h @@ -34,13 +34,13 @@ class JSSVGClipPathElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGClipPathElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGClipPathElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGClipPathElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,28 +64,28 @@ public: // Functions -JSC::JSValuePtr jsSVGClipPathElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGClipPathElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGClipPathElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGClipPathElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGClipPathElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGClipPathElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGClipPathElementClipPathUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGClipPathElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGClipPathElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGClipPathElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGClipPathElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGClipPathElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGClipPathElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGClipPathElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGClipPathElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGClipPathElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGClipPathElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGClipPathElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGClipPathElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGClipPathElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGClipPathElementClipPathUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGClipPathElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGClipPathElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGClipPathElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGClipPathElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGClipPathElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGClipPathElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGClipPathElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGClipPathElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGClipPathElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGClipPathElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGClipPathElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGClipPathElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGClipPathElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGColor.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGColor.cpp index 12109d644f..bb0cc4fbe9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGColor.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGColor.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGColor) +ASSERT_CLASS_FITS_IN_CELL(JSSVGColor); /* Hash table */ @@ -80,13 +80,13 @@ public: JSSVGColorConstructor(ExecState* exec) : DOMObject(JSSVGColorConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGColorPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGColorPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -122,9 +122,9 @@ static const HashTable JSSVGColorPrototypeTable = const ClassInfo JSSVGColorPrototype::s_info = { "SVGColorPrototype", 0, &JSSVGColorPrototypeTable, 0 }; -JSObject* JSSVGColorPrototype::self(ExecState* exec) +JSObject* JSSVGColorPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGColor>(exec); + return getDOMPrototype<JSSVGColor>(exec, globalObject); } bool JSSVGColorPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -139,9 +139,9 @@ JSSVGColor::JSSVGColor(PassRefPtr<Structure> structure, PassRefPtr<SVGColor> imp { } -JSObject* JSSVGColor::createPrototype(ExecState* exec) +JSObject* JSSVGColor::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGColorPrototype(JSSVGColorPrototype::createStructure(JSCSSValuePrototype::self(exec))); + return new (exec) JSSVGColorPrototype(JSSVGColorPrototype::createStructure(JSCSSValuePrototype::self(exec, globalObject))); } bool JSSVGColor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -149,66 +149,71 @@ bool JSSVGColor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN return getStaticValueSlot<JSSVGColor, Base>(exec, &JSSVGColorTable, this, propertyName, slot); } -JSValuePtr jsSVGColorColorType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGColorColorType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGColor* imp = static_cast<SVGColor*>(static_cast<JSSVGColor*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->colorType()); } -JSValuePtr jsSVGColorRgbColor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGColorRgbColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGColor* imp = static_cast<SVGColor*>(static_cast<JSSVGColor*>(asObject(slot.slotBase()))->impl()); return getJSRGBColor(exec, imp->rgbColor()); } -JSValuePtr jsSVGColorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGColorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGColor*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSSVGColor::getConstructor(ExecState* exec) +JSValue JSSVGColor::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGColorConstructor>(exec); } -JSValuePtr jsSVGColorPrototypeFunctionSetRGBColor(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGColorPrototypeFunctionSetRGBColor(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGColor::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGColor::s_info)) return throwError(exec, TypeError); JSSVGColor* castedThisObj = static_cast<JSSVGColor*>(asObject(thisValue)); SVGColor* imp = static_cast<SVGColor*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& rgbColor = args.at(exec, 0)->toString(exec); + const UString& rgbColor = args.at(0).toString(exec); imp->setRGBColor(rgbColor, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsSVGColorPrototypeFunctionSetRGBColorICCColor(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGColorPrototypeFunctionSetRGBColorICCColor(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGColor::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGColor::s_info)) return throwError(exec, TypeError); JSSVGColor* castedThisObj = static_cast<JSSVGColor*>(asObject(thisValue)); SVGColor* imp = static_cast<SVGColor*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& rgbColor = args.at(exec, 0)->toString(exec); - const UString& iccColor = args.at(exec, 1)->toString(exec); + const UString& rgbColor = args.at(0).toString(exec); + const UString& iccColor = args.at(1).toString(exec); imp->setRGBColorICCColor(rgbColor, iccColor, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsSVGColorPrototypeFunctionSetColor(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGColorPrototypeFunctionSetColor(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGColor::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGColor::s_info)) return throwError(exec, TypeError); JSSVGColor* castedThisObj = static_cast<JSSVGColor*>(asObject(thisValue)); SVGColor* imp = static_cast<SVGColor*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned short colorType = args.at(exec, 0)->toInt32(exec); - const UString& rgbColor = args.at(exec, 1)->toString(exec); - const UString& iccColor = args.at(exec, 2)->toString(exec); + unsigned short colorType = args.at(0).toInt32(exec); + const UString& rgbColor = args.at(1).toString(exec); + const UString& iccColor = args.at(2).toString(exec); imp->setColor(colorType, rgbColor, iccColor, ec); setDOMException(exec, ec); @@ -217,22 +222,22 @@ JSValuePtr jsSVGColorPrototypeFunctionSetColor(ExecState* exec, JSObject*, JSVal // Constant getters -JSValuePtr jsSVGColorSVG_COLORTYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGColorSVG_COLORTYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGColorSVG_COLORTYPE_RGBCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGColorSVG_COLORTYPE_RGBCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGColorSVG_COLORTYPE_RGBCOLOR_ICCCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGColorSVG_COLORTYPE_RGBCOLOR_ICCCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGColorSVG_COLORTYPE_CURRENTCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGColorSVG_COLORTYPE_CURRENTCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGColor.h b/src/3rdparty/webkit/WebCore/generated/JSSVGColor.h index c3d39a670a..da77c7d485 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGColor.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGColor.h @@ -34,27 +34,28 @@ class JSSVGColor : public JSCSSValue { typedef JSCSSValue Base; public: JSSVGColor(PassRefPtr<JSC::Structure>, PassRefPtr<SVGColor>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSSVGColorPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,20 +64,20 @@ public: // Functions -JSC::JSValuePtr jsSVGColorPrototypeFunctionSetRGBColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGColorPrototypeFunctionSetRGBColorICCColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGColorPrototypeFunctionSetColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGColorPrototypeFunctionSetRGBColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGColorPrototypeFunctionSetRGBColorICCColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGColorPrototypeFunctionSetColor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGColorColorType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGColorRgbColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGColorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGColorColorType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGColorRgbColor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGColorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGColorSVG_COLORTYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGColorSVG_COLORTYPE_RGBCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGColorSVG_COLORTYPE_RGBCOLOR_ICCCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGColorSVG_COLORTYPE_CURRENTCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGColorSVG_COLORTYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGColorSVG_COLORTYPE_RGBCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGColorSVG_COLORTYPE_RGBCOLOR_ICCCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGColorSVG_COLORTYPE_CURRENTCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGComponentTransferFunctionElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGComponentTransferFunctionElement.cpp index cc2f34cdeb..a9b2fb0704 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGComponentTransferFunctionElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGComponentTransferFunctionElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGComponentTransferFunctionElement.h" @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGComponentTransferFunctionElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGComponentTransferFunctionElement); /* Hash table */ @@ -88,13 +88,13 @@ public: JSSVGComponentTransferFunctionElementConstructor(ExecState* exec) : DOMObject(JSSVGComponentTransferFunctionElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGComponentTransferFunctionElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGComponentTransferFunctionElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -129,9 +129,9 @@ static const HashTable JSSVGComponentTransferFunctionElementPrototypeTable = const ClassInfo JSSVGComponentTransferFunctionElementPrototype::s_info = { "SVGComponentTransferFunctionElementPrototype", 0, &JSSVGComponentTransferFunctionElementPrototypeTable, 0 }; -JSObject* JSSVGComponentTransferFunctionElementPrototype::self(ExecState* exec) +JSObject* JSSVGComponentTransferFunctionElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGComponentTransferFunctionElement>(exec); + return getDOMPrototype<JSSVGComponentTransferFunctionElement>(exec, globalObject); } bool JSSVGComponentTransferFunctionElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -146,9 +146,9 @@ JSSVGComponentTransferFunctionElement::JSSVGComponentTransferFunctionElement(Pas { } -JSObject* JSSVGComponentTransferFunctionElement::createPrototype(ExecState* exec) +JSObject* JSSVGComponentTransferFunctionElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGComponentTransferFunctionElementPrototype(JSSVGComponentTransferFunctionElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGComponentTransferFunctionElementPrototype(JSSVGComponentTransferFunctionElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGComponentTransferFunctionElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -156,92 +156,99 @@ bool JSSVGComponentTransferFunctionElement::getOwnPropertySlot(ExecState* exec, return getStaticValueSlot<JSSVGComponentTransferFunctionElement, Base>(exec, &JSSVGComponentTransferFunctionElementTable, this, propertyName, slot); } -JSValuePtr jsSVGComponentTransferFunctionElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGComponentTransferFunctionElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGComponentTransferFunctionElement* imp = static_cast<SVGComponentTransferFunctionElement*>(static_cast<JSSVGComponentTransferFunctionElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->typeAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGComponentTransferFunctionElementTableValues(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGComponentTransferFunctionElementTableValues(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGComponentTransferFunctionElement* imp = static_cast<SVGComponentTransferFunctionElement*>(static_cast<JSSVGComponentTransferFunctionElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumberList> obj = imp->tableValuesAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGComponentTransferFunctionElementSlope(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGComponentTransferFunctionElementSlope(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGComponentTransferFunctionElement* imp = static_cast<SVGComponentTransferFunctionElement*>(static_cast<JSSVGComponentTransferFunctionElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->slopeAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGComponentTransferFunctionElementIntercept(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGComponentTransferFunctionElementIntercept(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGComponentTransferFunctionElement* imp = static_cast<SVGComponentTransferFunctionElement*>(static_cast<JSSVGComponentTransferFunctionElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->interceptAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGComponentTransferFunctionElementAmplitude(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGComponentTransferFunctionElementAmplitude(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGComponentTransferFunctionElement* imp = static_cast<SVGComponentTransferFunctionElement*>(static_cast<JSSVGComponentTransferFunctionElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->amplitudeAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGComponentTransferFunctionElementExponent(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGComponentTransferFunctionElementExponent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGComponentTransferFunctionElement* imp = static_cast<SVGComponentTransferFunctionElement*>(static_cast<JSSVGComponentTransferFunctionElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->exponentAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGComponentTransferFunctionElementOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGComponentTransferFunctionElementOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGComponentTransferFunctionElement* imp = static_cast<SVGComponentTransferFunctionElement*>(static_cast<JSSVGComponentTransferFunctionElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->offsetAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGComponentTransferFunctionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGComponentTransferFunctionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGComponentTransferFunctionElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSSVGComponentTransferFunctionElement::getConstructor(ExecState* exec) +JSValue JSSVGComponentTransferFunctionElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGComponentTransferFunctionElementConstructor>(exec); } // Constant getters -JSValuePtr jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_IDENTITY(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_IDENTITY(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_TABLE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_TABLE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_DISCRETE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_DISCRETE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_LINEAR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_LINEAR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSValuePtr jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_GAMMA(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_GAMMA(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(5)); } @@ -249,4 +256,4 @@ JSValuePtr jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_GAM } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGComponentTransferFunctionElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGComponentTransferFunctionElement.h index dbcb93a83c..98f427e8dd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGComponentTransferFunctionElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGComponentTransferFunctionElement.h @@ -22,7 +22,7 @@ #define JSSVGComponentTransferFunctionElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,27 +34,28 @@ class JSSVGComponentTransferFunctionElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGComponentTransferFunctionElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGComponentTransferFunctionElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSSVGComponentTransferFunctionElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,25 +64,25 @@ public: // Attributes -JSC::JSValuePtr jsSVGComponentTransferFunctionElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGComponentTransferFunctionElementTableValues(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGComponentTransferFunctionElementSlope(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGComponentTransferFunctionElementIntercept(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGComponentTransferFunctionElementAmplitude(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGComponentTransferFunctionElementExponent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGComponentTransferFunctionElementOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGComponentTransferFunctionElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGComponentTransferFunctionElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGComponentTransferFunctionElementTableValues(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGComponentTransferFunctionElementSlope(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGComponentTransferFunctionElementIntercept(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGComponentTransferFunctionElementAmplitude(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGComponentTransferFunctionElementExponent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGComponentTransferFunctionElementOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGComponentTransferFunctionElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_IDENTITY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_TABLE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_DISCRETE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_LINEAR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_GAMMA(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_IDENTITY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_TABLE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_DISCRETE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_LINEAR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGComponentTransferFunctionElementSVG_FECOMPONENTTRANSFER_TYPE_GAMMA(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGCursorElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGCursorElement.cpp index ca283f064f..8a354563a0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGCursorElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGCursorElement.cpp @@ -41,7 +41,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGCursorElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGCursorElement); /* Hash table */ @@ -81,9 +81,9 @@ static const HashTable JSSVGCursorElementPrototypeTable = const ClassInfo JSSVGCursorElementPrototype::s_info = { "SVGCursorElementPrototype", 0, &JSSVGCursorElementPrototypeTable, 0 }; -JSObject* JSSVGCursorElementPrototype::self(ExecState* exec) +JSObject* JSSVGCursorElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGCursorElement>(exec); + return getDOMPrototype<JSSVGCursorElement>(exec, globalObject); } bool JSSVGCursorElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -98,9 +98,9 @@ JSSVGCursorElement::JSSVGCursorElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSSVGCursorElement::createPrototype(ExecState* exec) +JSObject* JSSVGCursorElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGCursorElementPrototype(JSSVGCursorElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGCursorElementPrototype(JSSVGCursorElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGCursorElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -108,62 +108,70 @@ bool JSSVGCursorElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSSVGCursorElement, Base>(exec, &JSSVGCursorElementTable, this, propertyName, slot); } -JSValuePtr jsSVGCursorElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCursorElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCursorElement* imp = static_cast<SVGCursorElement*>(static_cast<JSSVGCursorElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGCursorElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCursorElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCursorElement* imp = static_cast<SVGCursorElement*>(static_cast<JSSVGCursorElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGCursorElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCursorElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCursorElement* imp = static_cast<SVGCursorElement*>(static_cast<JSSVGCursorElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->hrefAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGCursorElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCursorElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCursorElement* imp = static_cast<SVGCursorElement*>(static_cast<JSSVGCursorElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGCursorElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCursorElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCursorElement* imp = static_cast<SVGCursorElement*>(static_cast<JSSVGCursorElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGCursorElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCursorElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCursorElement* imp = static_cast<SVGCursorElement*>(static_cast<JSSVGCursorElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGCursorElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGCursorElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGCursorElement* imp = static_cast<SVGCursorElement*>(static_cast<JSSVGCursorElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGCursorElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGCursorElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGCursorElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGCursorElement::s_info)) return throwError(exec, TypeError); JSSVGCursorElement* castedThisObj = static_cast<JSSVGCursorElement*>(asObject(thisValue)); SVGCursorElement* imp = static_cast<SVGCursorElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGCursorElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGCursorElement.h index a7de88f179..ff680ba825 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGCursorElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGCursorElement.h @@ -34,12 +34,12 @@ class JSSVGCursorElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGCursorElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGCursorElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,12 +48,13 @@ public: class JSSVGCursorElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -62,16 +63,16 @@ public: // Functions -JSC::JSValuePtr jsSVGCursorElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGCursorElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGCursorElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCursorElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCursorElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCursorElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCursorElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCursorElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGCursorElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCursorElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCursorElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCursorElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCursorElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCursorElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCursorElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGCursorElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGDefinitionSrcElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGDefinitionSrcElement.cpp index 90f6c49ccc..98981c18dd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGDefinitionSrcElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGDefinitionSrcElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGDefinitionSrcElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGDefinitionSrcElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGDefinitionSrcElementPrototypeTable = const ClassInfo JSSVGDefinitionSrcElementPrototype::s_info = { "SVGDefinitionSrcElementPrototype", 0, &JSSVGDefinitionSrcElementPrototypeTable, 0 }; -JSObject* JSSVGDefinitionSrcElementPrototype::self(ExecState* exec) +JSObject* JSSVGDefinitionSrcElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGDefinitionSrcElement>(exec); + return getDOMPrototype<JSSVGDefinitionSrcElement>(exec, globalObject); } const ClassInfo JSSVGDefinitionSrcElement::s_info = { "SVGDefinitionSrcElement", &JSSVGElement::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGDefinitionSrcElement::JSSVGDefinitionSrcElement(PassRefPtr<Structure> struc { } -JSObject* JSSVGDefinitionSrcElement::createPrototype(ExecState* exec) +JSObject* JSSVGDefinitionSrcElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGDefinitionSrcElementPrototype(JSSVGDefinitionSrcElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGDefinitionSrcElementPrototype(JSSVGDefinitionSrcElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGDefinitionSrcElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGDefinitionSrcElement.h index 8bb0f184ef..9c898867b6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGDefinitionSrcElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGDefinitionSrcElement.h @@ -34,7 +34,7 @@ class JSSVGDefinitionSrcElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGDefinitionSrcElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGDefinitionSrcElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGDefinitionSrcElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGDefinitionSrcElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGDefsElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGDefsElement.cpp index 7331eda315..5cdeffc38c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGDefsElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGDefsElement.cpp @@ -52,7 +52,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGDefsElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGDefsElement); /* Hash table */ @@ -101,9 +101,9 @@ static const HashTable JSSVGDefsElementPrototypeTable = const ClassInfo JSSVGDefsElementPrototype::s_info = { "SVGDefsElementPrototype", 0, &JSSVGDefsElementPrototypeTable, 0 }; -JSObject* JSSVGDefsElementPrototype::self(ExecState* exec) +JSObject* JSSVGDefsElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGDefsElement>(exec); + return getDOMPrototype<JSSVGDefsElement>(exec, globalObject); } bool JSSVGDefsElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -118,9 +118,9 @@ JSSVGDefsElement::JSSVGDefsElement(PassRefPtr<Structure> structure, PassRefPtr<S { } -JSObject* JSSVGDefsElement::createPrototype(ExecState* exec) +JSObject* JSSVGDefsElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGDefsElementPrototype(JSSVGDefsElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGDefsElementPrototype(JSSVGDefsElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGDefsElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,165 +128,182 @@ bool JSSVGDefsElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSSVGDefsElement, Base>(exec, &JSSVGDefsElementTable, this, propertyName, slot); } -JSValuePtr jsSVGDefsElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGDefsElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGDefsElement* imp = static_cast<SVGDefsElement*>(static_cast<JSSVGDefsElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGDefsElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGDefsElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGDefsElement* imp = static_cast<SVGDefsElement*>(static_cast<JSSVGDefsElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGDefsElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGDefsElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGDefsElement* imp = static_cast<SVGDefsElement*>(static_cast<JSSVGDefsElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGDefsElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGDefsElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGDefsElement* imp = static_cast<SVGDefsElement*>(static_cast<JSSVGDefsElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGDefsElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGDefsElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGDefsElement* imp = static_cast<SVGDefsElement*>(static_cast<JSSVGDefsElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGDefsElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGDefsElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGDefsElement* imp = static_cast<SVGDefsElement*>(static_cast<JSSVGDefsElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGDefsElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGDefsElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGDefsElement* imp = static_cast<SVGDefsElement*>(static_cast<JSSVGDefsElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGDefsElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGDefsElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGDefsElement* imp = static_cast<SVGDefsElement*>(static_cast<JSSVGDefsElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGDefsElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGDefsElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGDefsElement* imp = static_cast<SVGDefsElement*>(static_cast<JSSVGDefsElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->transformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGDefsElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGDefsElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGDefsElement* imp = static_cast<SVGDefsElement*>(static_cast<JSSVGDefsElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGDefsElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGDefsElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGDefsElement* imp = static_cast<SVGDefsElement*>(static_cast<JSSVGDefsElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -void JSSVGDefsElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGDefsElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGDefsElement, Base>(exec, propertyName, value, &JSSVGDefsElementTable, this, slot); } -void setJSSVGDefsElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGDefsElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGDefsElement* imp = static_cast<SVGDefsElement*>(static_cast<JSSVGDefsElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGDefsElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGDefsElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGDefsElement* imp = static_cast<SVGDefsElement*>(static_cast<JSSVGDefsElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGDefsElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGDefsElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGDefsElement::s_info)) return throwError(exec, TypeError); JSSVGDefsElement* castedThisObj = static_cast<JSSVGDefsElement*>(asObject(thisValue)); SVGDefsElement* imp = static_cast<SVGDefsElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGDefsElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGDefsElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGDefsElement::s_info)) return throwError(exec, TypeError); JSSVGDefsElement* castedThisObj = static_cast<JSSVGDefsElement*>(asObject(thisValue)); SVGDefsElement* imp = static_cast<SVGDefsElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } -JSValuePtr jsSVGDefsElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGDefsElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGDefsElement::s_info)) return throwError(exec, TypeError); JSSVGDefsElement* castedThisObj = static_cast<JSSVGDefsElement*>(asObject(thisValue)); SVGDefsElement* imp = static_cast<SVGDefsElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGDefsElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGDefsElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGDefsElement::s_info)) return throwError(exec, TypeError); JSSVGDefsElement* castedThisObj = static_cast<JSSVGDefsElement*>(asObject(thisValue)); SVGDefsElement* imp = static_cast<SVGDefsElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGDefsElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGDefsElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGDefsElement::s_info)) return throwError(exec, TypeError); JSSVGDefsElement* castedThisObj = static_cast<JSSVGDefsElement*>(asObject(thisValue)); SVGDefsElement* imp = static_cast<SVGDefsElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGDefsElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGDefsElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGDefsElement::s_info)) return throwError(exec, TypeError); JSSVGDefsElement* castedThisObj = static_cast<JSSVGDefsElement*>(asObject(thisValue)); SVGDefsElement* imp = static_cast<SVGDefsElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGDefsElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGDefsElement.h index 7468939126..0b4932cc35 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGDefsElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGDefsElement.h @@ -34,13 +34,13 @@ class JSSVGDefsElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGDefsElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGDefsElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGDefsElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,27 +64,27 @@ public: // Functions -JSC::JSValuePtr jsSVGDefsElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGDefsElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGDefsElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGDefsElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGDefsElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGDefsElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGDefsElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGDefsElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGDefsElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGDefsElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGDefsElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGDefsElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGDefsElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGDefsElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGDefsElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGDefsElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGDefsElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGDefsElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGDefsElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGDefsElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGDefsElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGDefsElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGDefsElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGDefsElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGDefsElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGDefsElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGDefsElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGDefsElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGDefsElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGDefsElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGDefsElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGDefsElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGDescElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGDescElement.cpp index a2a609a4a4..80b5adf767 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGDescElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGDescElement.cpp @@ -44,7 +44,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGDescElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGDescElement); /* Hash table */ @@ -81,9 +81,9 @@ static const HashTable JSSVGDescElementPrototypeTable = const ClassInfo JSSVGDescElementPrototype::s_info = { "SVGDescElementPrototype", 0, &JSSVGDescElementPrototypeTable, 0 }; -JSObject* JSSVGDescElementPrototype::self(ExecState* exec) +JSObject* JSSVGDescElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGDescElement>(exec); + return getDOMPrototype<JSSVGDescElement>(exec, globalObject); } bool JSSVGDescElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -98,9 +98,9 @@ JSSVGDescElement::JSSVGDescElement(PassRefPtr<Structure> structure, PassRefPtr<S { } -JSObject* JSSVGDescElement::createPrototype(ExecState* exec) +JSObject* JSSVGDescElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGDescElementPrototype(JSSVGDescElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGDescElementPrototype(JSSVGDescElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGDescElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -108,58 +108,63 @@ bool JSSVGDescElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSSVGDescElement, Base>(exec, &JSSVGDescElementTable, this, propertyName, slot); } -JSValuePtr jsSVGDescElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGDescElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGDescElement* imp = static_cast<SVGDescElement*>(static_cast<JSSVGDescElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGDescElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGDescElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGDescElement* imp = static_cast<SVGDescElement*>(static_cast<JSSVGDescElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGDescElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGDescElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGDescElement* imp = static_cast<SVGDescElement*>(static_cast<JSSVGDescElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGDescElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGDescElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGDescElement* imp = static_cast<SVGDescElement*>(static_cast<JSSVGDescElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -void JSSVGDescElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGDescElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGDescElement, Base>(exec, propertyName, value, &JSSVGDescElementTable, this, slot); } -void setJSSVGDescElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGDescElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGDescElement* imp = static_cast<SVGDescElement*>(static_cast<JSSVGDescElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGDescElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGDescElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGDescElement* imp = static_cast<SVGDescElement*>(static_cast<JSSVGDescElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGDescElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGDescElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGDescElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGDescElement::s_info)) return throwError(exec, TypeError); JSSVGDescElement* castedThisObj = static_cast<JSSVGDescElement*>(asObject(thisValue)); SVGDescElement* imp = static_cast<SVGDescElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGDescElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGDescElement.h index 05335ffaa6..b89076ed3b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGDescElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGDescElement.h @@ -34,13 +34,13 @@ class JSSVGDescElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGDescElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGDescElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGDescElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,15 +64,15 @@ public: // Functions -JSC::JSValuePtr jsSVGDescElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGDescElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGDescElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGDescElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGDescElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGDescElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGDescElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGDescElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGDescElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGDescElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGDescElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGDescElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGDescElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGDescElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGDocument.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGDocument.cpp index e851b72480..47de2841f6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGDocument.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGDocument.cpp @@ -40,7 +40,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGDocument) +ASSERT_CLASS_FITS_IN_CELL(JSSVGDocument); /* Hash table */ @@ -74,9 +74,9 @@ static const HashTable JSSVGDocumentPrototypeTable = const ClassInfo JSSVGDocumentPrototype::s_info = { "SVGDocumentPrototype", 0, &JSSVGDocumentPrototypeTable, 0 }; -JSObject* JSSVGDocumentPrototype::self(ExecState* exec) +JSObject* JSSVGDocumentPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGDocument>(exec); + return getDOMPrototype<JSSVGDocument>(exec, globalObject); } bool JSSVGDocumentPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -91,9 +91,9 @@ JSSVGDocument::JSSVGDocument(PassRefPtr<Structure> structure, PassRefPtr<SVGDocu { } -JSObject* JSSVGDocument::createPrototype(ExecState* exec) +JSObject* JSSVGDocument::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGDocumentPrototype(JSSVGDocumentPrototype::createStructure(JSDocumentPrototype::self(exec))); + return new (exec) JSSVGDocumentPrototype(JSSVGDocumentPrototype::createStructure(JSDocumentPrototype::self(exec, globalObject))); } bool JSSVGDocument::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -101,23 +101,25 @@ bool JSSVGDocument::getOwnPropertySlot(ExecState* exec, const Identifier& proper return getStaticValueSlot<JSSVGDocument, Base>(exec, &JSSVGDocumentTable, this, propertyName, slot); } -JSValuePtr jsSVGDocumentRootElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGDocumentRootElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGDocument* imp = static_cast<SVGDocument*>(static_cast<JSSVGDocument*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->rootElement())); } -JSValuePtr jsSVGDocumentPrototypeFunctionCreateEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGDocumentPrototypeFunctionCreateEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGDocument::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGDocument::s_info)) return throwError(exec, TypeError); JSSVGDocument* castedThisObj = static_cast<JSSVGDocument*>(asObject(thisValue)); SVGDocument* imp = static_cast<SVGDocument*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& eventType = args.at(exec, 0)->toString(exec); + const UString& eventType = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createEvent(eventType, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createEvent(eventType, ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGDocument.h b/src/3rdparty/webkit/WebCore/generated/JSSVGDocument.h index 11b1aee96d..e9541ddf2d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGDocument.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGDocument.h @@ -34,12 +34,12 @@ class JSSVGDocument : public JSDocument { typedef JSDocument Base; public: JSSVGDocument(PassRefPtr<JSC::Structure>, PassRefPtr<SVGDocument>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,12 +48,13 @@ public: class JSSVGDocumentPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -62,10 +63,10 @@ public: // Functions -JSC::JSValuePtr jsSVGDocumentPrototypeFunctionCreateEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGDocumentPrototypeFunctionCreateEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGDocumentRootElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGDocumentRootElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGElement.cpp index 158aee5ae2..94f7c2927a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGElement.cpp @@ -40,7 +40,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGElement); /* Hash table */ @@ -76,9 +76,9 @@ static const HashTable JSSVGElementPrototypeTable = const ClassInfo JSSVGElementPrototype::s_info = { "SVGElementPrototype", 0, &JSSVGElementPrototypeTable, 0 }; -JSObject* JSSVGElementPrototype::self(ExecState* exec) +JSObject* JSSVGElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGElement>(exec); + return getDOMPrototype<JSSVGElement>(exec, globalObject); } const ClassInfo JSSVGElement::s_info = { "SVGElement", &JSElement::s_info, &JSSVGElementTable, 0 }; @@ -88,9 +88,9 @@ JSSVGElement::JSSVGElement(PassRefPtr<Structure> structure, PassRefPtr<SVGElemen { } -JSObject* JSSVGElement::createPrototype(ExecState* exec) +JSObject* JSSVGElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGElementPrototype(JSSVGElementPrototype::createStructure(JSElementPrototype::self(exec))); + return new (exec) JSSVGElementPrototype(JSSVGElementPrototype::createStructure(JSElementPrototype::self(exec, globalObject))); } bool JSSVGElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -98,36 +98,40 @@ bool JSSVGElement::getOwnPropertySlot(ExecState* exec, const Identifier& propert return getStaticValueSlot<JSSVGElement, Base>(exec, &JSSVGElementTable, this, propertyName, slot); } -JSValuePtr jsSVGElementId(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElement* imp = static_cast<SVGElement*>(static_cast<JSSVGElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->id()); } -JSValuePtr jsSVGElementXmlbase(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementXmlbase(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElement* imp = static_cast<SVGElement*>(static_cast<JSSVGElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlbase()); } -JSValuePtr jsSVGElementOwnerSVGElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementOwnerSVGElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElement* imp = static_cast<SVGElement*>(static_cast<JSSVGElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->ownerSVGElement())); } -JSValuePtr jsSVGElementViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElement* imp = static_cast<SVGElement*>(static_cast<JSSVGElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->viewportElement())); } -void JSSVGElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGElement, Base>(exec, propertyName, value, &JSSVGElementTable, this, slot); } -void setJSSVGElementId(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementId(ExecState* exec, JSObject* thisObject, JSValue value) { SVGElement* imp = static_cast<SVGElement*>(static_cast<JSSVGElement*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -135,7 +139,7 @@ void setJSSVGElementId(ExecState* exec, JSObject* thisObject, JSValuePtr value) setDOMException(exec, ec); } -void setJSSVGElementXmlbase(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementXmlbase(ExecState* exec, JSObject* thisObject, JSValue value) { SVGElement* imp = static_cast<SVGElement*>(static_cast<JSSVGElement*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -143,9 +147,9 @@ void setJSSVGElementXmlbase(ExecState* exec, JSObject* thisObject, JSValuePtr va setDOMException(exec, ec); } -SVGElement* toSVGElement(JSC::JSValuePtr value) +SVGElement* toSVGElement(JSC::JSValue value) { - return value->isObject(&JSSVGElement::s_info) ? static_cast<JSSVGElement*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGElement::s_info) ? static_cast<JSSVGElement*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGElement.h index a8b5cf36fc..a06116e439 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGElement.h @@ -34,13 +34,13 @@ class JSSVGElement : public JSElement { typedef JSElement Base; public: JSSVGElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -51,11 +51,12 @@ public: } }; -SVGElement* toSVGElement(JSC::JSValuePtr); +SVGElement* toSVGElement(JSC::JSValue); class JSSVGElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -63,12 +64,12 @@ public: // Attributes -JSC::JSValuePtr jsSVGElementId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementId(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementXmlbase(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementXmlbase(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementOwnerSVGElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGElementViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGElementId(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementId(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementXmlbase(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementXmlbase(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementOwnerSVGElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGElementViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstance.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstance.cpp index 8c903fa753..2c8ad7dc87 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstance.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstance.cpp @@ -49,7 +49,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGElementInstance) +ASSERT_CLASS_FITS_IN_CELL(JSSVGElementInstance); /* Hash table */ @@ -132,9 +132,9 @@ static const HashTable JSSVGElementInstancePrototypeTable = const ClassInfo JSSVGElementInstancePrototype::s_info = { "SVGElementInstancePrototype", 0, &JSSVGElementInstancePrototypeTable, 0 }; -JSObject* JSSVGElementInstancePrototype::self(ExecState* exec) +JSObject* JSSVGElementInstancePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGElementInstance>(exec); + return getDOMPrototype<JSSVGElementInstance>(exec, globalObject); } bool JSSVGElementInstancePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -153,12 +153,11 @@ JSSVGElementInstance::JSSVGElementInstance(PassRefPtr<Structure> structure, Pass JSSVGElementInstance::~JSSVGElementInstance() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGElementInstance::createPrototype(ExecState* exec) +JSObject* JSSVGElementInstance::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGElementInstancePrototype(JSSVGElementInstancePrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGElementInstancePrototype(JSSVGElementInstancePrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGElementInstance::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -166,857 +165,944 @@ bool JSSVGElementInstance::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGElementInstance, Base>(exec, &JSSVGElementInstanceTable, this, propertyName, slot); } -JSValuePtr jsSVGElementInstanceCorrespondingElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceCorrespondingElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->correspondingElement())); } -JSValuePtr jsSVGElementInstanceCorrespondingUseElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceCorrespondingUseElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->correspondingUseElement())); } -JSValuePtr jsSVGElementInstanceParentNode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceParentNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->parentNode())); } -JSValuePtr jsSVGElementInstanceChildNodes(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceChildNodes(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->childNodes())); } -JSValuePtr jsSVGElementInstanceFirstChild(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceFirstChild(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->firstChild())); } -JSValuePtr jsSVGElementInstanceLastChild(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceLastChild(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->lastChild())); } -JSValuePtr jsSVGElementInstancePreviousSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstancePreviousSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->previousSibling())); } -JSValuePtr jsSVGElementInstanceNextSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceNextSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nextSibling())); } -JSValuePtr jsSVGElementInstanceOnabort(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnabort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onabort())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onabort()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnblur(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnblur(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onblur())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onblur()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnchange(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnchange(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onchange())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onchange()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnclick(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnclick(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onclick())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onclick()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOncontextmenu(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOncontextmenu(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->oncontextmenu())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->oncontextmenu()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOndblclick(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOndblclick(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondblclick())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->ondblclick()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onerror())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onerror()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnfocus(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnfocus(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onfocus())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onfocus()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOninput(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOninput(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->oninput())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->oninput()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnkeydown(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnkeydown(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onkeydown())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onkeydown()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnkeypress(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnkeypress(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onkeypress())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onkeypress()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnkeyup(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnkeyup(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onkeyup())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onkeyup()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnload(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnload(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onload())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onload()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnmousedown(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnmousedown(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmousedown())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onmousedown()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnmousemove(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnmousemove(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmousemove())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onmousemove()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnmouseout(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnmouseout(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmouseout())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onmouseout()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnmouseover(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnmouseover(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmouseover())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onmouseover()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnmouseup(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnmouseup(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmouseup())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onmouseup()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnmousewheel(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnmousewheel(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onmousewheel())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onmousewheel()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnbeforecut(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnbeforecut(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onbeforecut())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onbeforecut()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOncut(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOncut(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->oncut())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->oncut()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnbeforecopy(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnbeforecopy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onbeforecopy())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onbeforecopy()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOncopy(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOncopy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->oncopy())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->oncopy()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnbeforepaste(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnbeforepaste(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onbeforepaste())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onbeforepaste()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnpaste(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnpaste(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onpaste())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onpaste()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOndragenter(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOndragenter(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondragenter())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->ondragenter()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOndragover(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOndragover(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondragover())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->ondragover()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOndragleave(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOndragleave(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondragleave())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->ondragleave()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOndrop(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOndrop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondrop())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->ondrop()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOndragstart(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOndragstart(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondragstart())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->ondragstart()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOndrag(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOndrag(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondrag())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->ondrag()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOndragend(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOndragend(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->ondragend())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->ondragend()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnreset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnreset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onreset())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onreset()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnresize(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnresize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onresize())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onresize()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnscroll(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnscroll(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onscroll())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onscroll()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnsearch(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnsearch(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onsearch())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onsearch()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnselect(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnselect(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onselect())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onselect()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnselectstart(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnselectstart(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onselectstart())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onselectstart()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnsubmit(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnsubmit(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onsubmit())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onsubmit()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsSVGElementInstanceOnunload(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceOnunload(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(asObject(slot.slotBase()))->impl()); - if (JSEventListener* listener = static_cast<JSEventListener*>(imp->onunload())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onunload()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -void JSSVGElementInstance::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGElementInstance::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGElementInstance, Base>(exec, propertyName, value, &JSSVGElementInstanceTable, this, slot); } -void setJSSVGElementInstanceOnabort(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnabort(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnabort(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnabort(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnblur(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnblur(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnblur(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnblur(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnchange(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnchange(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnchange(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnchange(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnclick(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnclick(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnclick(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnclick(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOncontextmenu(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOncontextmenu(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOncontextmenu(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOncontextmenu(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOndblclick(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOndblclick(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOndblclick(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndblclick(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnerror(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnerror(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnerror(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnerror(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnfocus(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnfocus(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnfocus(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnfocus(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOninput(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOninput(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOninput(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOninput(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnkeydown(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnkeydown(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnkeydown(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnkeydown(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnkeypress(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnkeypress(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnkeypress(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnkeypress(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnkeyup(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnkeyup(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnkeyup(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnkeyup(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnload(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnload(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnload(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnload(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnmousedown(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnmousedown(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnmousedown(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnmousedown(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnmousemove(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnmousemove(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnmousemove(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnmousemove(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnmouseout(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnmouseout(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnmouseout(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnmouseout(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnmouseover(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnmouseover(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnmouseover(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnmouseover(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnmouseup(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnmouseup(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnmouseup(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnmouseup(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnmousewheel(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnmousewheel(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnmousewheel(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnmousewheel(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnbeforecut(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnbeforecut(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnbeforecut(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnbeforecut(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOncut(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOncut(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOncut(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOncut(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnbeforecopy(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnbeforecopy(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnbeforecopy(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnbeforecopy(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOncopy(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOncopy(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOncopy(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOncopy(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnbeforepaste(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnbeforepaste(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnbeforepaste(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnbeforepaste(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnpaste(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnpaste(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnpaste(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnpaste(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOndragenter(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOndragenter(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOndragenter(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndragenter(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOndragover(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOndragover(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOndragover(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndragover(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOndragleave(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOndragleave(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOndragleave(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndragleave(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOndrop(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOndrop(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOndrop(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndrop(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOndragstart(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOndragstart(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOndragstart(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndragstart(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOndrag(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOndrag(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOndrag(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndrag(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOndragend(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOndragend(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOndragend(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOndragend(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnreset(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnreset(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnreset(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnreset(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnresize(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnresize(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnresize(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnresize(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnscroll(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnscroll(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnscroll(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnscroll(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnsearch(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnsearch(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnsearch(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnsearch(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnselect(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnselect(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnselect(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnselect(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnselectstart(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnselectstart(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnselectstart(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnselectstart(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnsubmit(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnsubmit(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnsubmit(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnsubmit(globalObject->createJSAttributeEventListener(value)); } -void setJSSVGElementInstanceOnunload(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGElementInstanceOnunload(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); SVGElementInstance* imp = static_cast<SVGElementInstance*>(static_cast<JSSVGElementInstance*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnunload(globalObject->findOrCreateJSEventListener(exec, value, true)); + imp->setOnunload(globalObject->createJSAttributeEventListener(value)); } -JSValuePtr jsSVGElementInstancePrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGElementInstancePrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGElementInstance::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGElementInstance::s_info)) return throwError(exec, TypeError); JSSVGElementInstance* castedThisObj = static_cast<JSSVGElementInstance*>(asObject(thisValue)); return castedThisObj->addEventListener(exec, args); } -JSValuePtr jsSVGElementInstancePrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGElementInstancePrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGElementInstance::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGElementInstance::s_info)) return throwError(exec, TypeError); JSSVGElementInstance* castedThisObj = static_cast<JSSVGElementInstance*>(asObject(thisValue)); return castedThisObj->removeEventListener(exec, args); } -JSValuePtr jsSVGElementInstancePrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGElementInstancePrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGElementInstance::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGElementInstance::s_info)) return throwError(exec, TypeError); JSSVGElementInstance* castedThisObj = static_cast<JSSVGElementInstance*>(asObject(thisValue)); SVGElementInstance* imp = static_cast<SVGElementInstance*>(castedThisObj->impl()); ExceptionCode ec = 0; - Event* event = toEvent(args.at(exec, 0)); + Event* event = toEvent(args.at(0)); - JSC::JSValuePtr result = jsBoolean(imp->dispatchEvent(event, ec)); + JSC::JSValue result = jsBoolean(imp->dispatchEvent(event, ec)); setDOMException(exec, ec); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGElementInstance* object) -{ - return getDOMObjectWrapper<JSSVGElementInstance>(exec, object); -} -SVGElementInstance* toSVGElementInstance(JSC::JSValuePtr value) +SVGElementInstance* toSVGElementInstance(JSC::JSValue value) { - return value->isObject(&JSSVGElementInstance::s_info) ? static_cast<JSSVGElementInstance*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGElementInstance::s_info) ? static_cast<JSSVGElementInstance*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstance.h b/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstance.h index 27beed2234..f529a3978a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstance.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstance.h @@ -37,39 +37,42 @@ class JSSVGElementInstance : public DOMObject { public: JSSVGElementInstance(PassRefPtr<JSC::Structure>, PassRefPtr<SVGElementInstance>); virtual ~JSSVGElementInstance(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } + virtual void mark(); + virtual void pushEventHandlerScope(JSC::ExecState*, JSC::ScopeChain&) const; // Custom functions - JSC::JSValuePtr addEventListener(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr removeEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue addEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue removeEventListener(JSC::ExecState*, const JSC::ArgList&); SVGElementInstance* impl() const { return m_impl.get(); } private: RefPtr<SVGElementInstance> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGElementInstance*); -SVGElementInstance* toSVGElementInstance(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGElementInstance*); +SVGElementInstance* toSVGElementInstance(JSC::JSValue); class JSSVGElementInstancePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -78,99 +81,99 @@ public: // Functions -JSC::JSValuePtr jsSVGElementInstancePrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGElementInstancePrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGElementInstancePrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGElementInstancePrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGElementInstancePrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGElementInstancePrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGElementInstanceCorrespondingElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGElementInstanceCorrespondingUseElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGElementInstanceParentNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGElementInstanceChildNodes(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGElementInstanceFirstChild(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGElementInstanceLastChild(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGElementInstancePreviousSibling(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGElementInstanceNextSibling(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGElementInstanceOnabort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnabort(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnblur(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnblur(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnchange(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnchange(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnclick(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnclick(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOncontextmenu(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOncontextmenu(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOndblclick(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOndblclick(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnfocus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnfocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOninput(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOninput(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnkeydown(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnkeydown(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnkeypress(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnkeypress(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnkeyup(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnkeyup(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnload(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnmousedown(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnmousedown(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnmousemove(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnmousemove(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnmouseout(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnmouseout(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnmouseover(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnmouseover(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnmouseup(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnmouseup(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnmousewheel(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnmousewheel(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnbeforecut(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnbeforecut(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOncut(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOncut(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnbeforecopy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnbeforecopy(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOncopy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOncopy(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnbeforepaste(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnbeforepaste(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnpaste(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnpaste(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOndragenter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOndragenter(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOndragover(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOndragover(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOndragleave(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOndragleave(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOndrop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOndrop(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOndragstart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOndragstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOndrag(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOndrag(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOndragend(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOndragend(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnreset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnreset(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnresize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnresize(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnscroll(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnscroll(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnsearch(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnsearch(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnselect(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnselect(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnselectstart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnselectstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnsubmit(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnsubmit(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGElementInstanceOnunload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGElementInstanceOnunload(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGElementInstanceCorrespondingElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGElementInstanceCorrespondingUseElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGElementInstanceParentNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGElementInstanceChildNodes(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGElementInstanceFirstChild(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGElementInstanceLastChild(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGElementInstancePreviousSibling(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGElementInstanceNextSibling(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGElementInstanceOnabort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnabort(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnblur(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnblur(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnchange(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnchange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnclick(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnclick(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOncontextmenu(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOncontextmenu(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOndblclick(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOndblclick(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnfocus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnfocus(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOninput(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOninput(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnkeydown(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnkeydown(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnkeypress(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnkeypress(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnkeyup(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnkeyup(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnload(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnmousedown(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnmousedown(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnmousemove(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnmousemove(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnmouseout(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnmouseout(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnmouseover(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnmouseover(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnmouseup(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnmouseup(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnmousewheel(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnmousewheel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnbeforecut(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnbeforecut(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOncut(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOncut(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnbeforecopy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnbeforecopy(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOncopy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOncopy(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnbeforepaste(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnbeforepaste(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnpaste(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnpaste(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOndragenter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOndragenter(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOndragover(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOndragover(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOndragleave(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOndragleave(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOndrop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOndrop(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOndragstart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOndragstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOndrag(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOndrag(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOndragend(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOndragend(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnreset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnreset(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnresize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnresize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnscroll(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnscroll(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnsearch(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnsearch(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnselect(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnselect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnselectstart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnselectstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnsubmit(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnsubmit(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGElementInstanceOnunload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGElementInstanceOnunload(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstanceList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstanceList.cpp index f5ece18cbe..bf0d240312 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstanceList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstanceList.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGElementInstanceList) +ASSERT_CLASS_FITS_IN_CELL(JSSVGElementInstanceList); /* Hash table */ @@ -73,9 +73,9 @@ static const HashTable JSSVGElementInstanceListPrototypeTable = const ClassInfo JSSVGElementInstanceListPrototype::s_info = { "SVGElementInstanceListPrototype", 0, &JSSVGElementInstanceListPrototypeTable, 0 }; -JSObject* JSSVGElementInstanceListPrototype::self(ExecState* exec) +JSObject* JSSVGElementInstanceListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGElementInstanceList>(exec); + return getDOMPrototype<JSSVGElementInstanceList>(exec, globalObject); } bool JSSVGElementInstanceListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -94,12 +94,11 @@ JSSVGElementInstanceList::JSSVGElementInstanceList(PassRefPtr<Structure> structu JSSVGElementInstanceList::~JSSVGElementInstanceList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGElementInstanceList::createPrototype(ExecState* exec) +JSObject* JSSVGElementInstanceList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGElementInstanceListPrototype(JSSVGElementInstanceListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGElementInstanceListPrototype(JSSVGElementInstanceListPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGElementInstanceList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -107,32 +106,34 @@ bool JSSVGElementInstanceList::getOwnPropertySlot(ExecState* exec, const Identif return getStaticValueSlot<JSSVGElementInstanceList, Base>(exec, &JSSVGElementInstanceListTable, this, propertyName, slot); } -JSValuePtr jsSVGElementInstanceListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGElementInstanceListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGElementInstanceList* imp = static_cast<SVGElementInstanceList*>(static_cast<JSSVGElementInstanceList*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsSVGElementInstanceListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGElementInstanceListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGElementInstanceList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGElementInstanceList::s_info)) return throwError(exec, TypeError); JSSVGElementInstanceList* castedThisObj = static_cast<JSSVGElementInstanceList*>(asObject(thisValue)); SVGElementInstanceList* imp = static_cast<SVGElementInstanceList*>(castedThisObj->impl()); - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGElementInstanceList* object) +JSC::JSValue toJS(JSC::ExecState* exec, SVGElementInstanceList* object) { return getDOMObjectWrapper<JSSVGElementInstanceList>(exec, object); } -SVGElementInstanceList* toSVGElementInstanceList(JSC::JSValuePtr value) +SVGElementInstanceList* toSVGElementInstanceList(JSC::JSValue value) { - return value->isObject(&JSSVGElementInstanceList::s_info) ? static_cast<JSSVGElementInstanceList*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGElementInstanceList::s_info) ? static_cast<JSSVGElementInstanceList*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstanceList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstanceList.h index c14e0d7879..3f5365c628 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstanceList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstanceList.h @@ -37,12 +37,12 @@ class JSSVGElementInstanceList : public DOMObject { public: JSSVGElementInstanceList(PassRefPtr<JSC::Structure>, PassRefPtr<SVGElementInstanceList>); virtual ~JSSVGElementInstanceList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -53,16 +53,17 @@ private: RefPtr<SVGElementInstanceList> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGElementInstanceList*); -SVGElementInstanceList* toSVGElementInstanceList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGElementInstanceList*); +SVGElementInstanceList* toSVGElementInstanceList(JSC::JSValue); class JSSVGElementInstanceListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -71,10 +72,10 @@ public: // Functions -JSC::JSValuePtr jsSVGElementInstanceListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGElementInstanceListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGElementInstanceListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGElementInstanceListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGElementWrapperFactory.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGElementWrapperFactory.cpp index a388fcbedd..657983330b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGElementWrapperFactory.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGElementWrapperFactory.cpp @@ -44,29 +44,6 @@ #include "JSSVGDefsElement.h" #include "JSSVGDescElement.h" #include "JSSVGEllipseElement.h" -#include "JSSVGFEBlendElement.h" -#include "JSSVGFEColorMatrixElement.h" -#include "JSSVGFEComponentTransferElement.h" -#include "JSSVGFECompositeElement.h" -#include "JSSVGFEDiffuseLightingElement.h" -#include "JSSVGFEDisplacementMapElement.h" -#include "JSSVGFEDistantLightElement.h" -#include "JSSVGFEFloodElement.h" -#include "JSSVGFEFuncAElement.h" -#include "JSSVGFEFuncBElement.h" -#include "JSSVGFEFuncGElement.h" -#include "JSSVGFEFuncRElement.h" -#include "JSSVGFEGaussianBlurElement.h" -#include "JSSVGFEImageElement.h" -#include "JSSVGFEMergeElement.h" -#include "JSSVGFEMergeNodeElement.h" -#include "JSSVGFEOffsetElement.h" -#include "JSSVGFEPointLightElement.h" -#include "JSSVGFESpecularLightingElement.h" -#include "JSSVGFESpotLightElement.h" -#include "JSSVGFETileElement.h" -#include "JSSVGFETurbulenceElement.h" -#include "JSSVGFilterElement.h" #include "JSSVGFontElement.h" #include "JSSVGFontFaceElement.h" #include "JSSVGFontFaceFormatElement.h" @@ -119,29 +96,6 @@ #include "SVGDefsElement.h" #include "SVGDescElement.h" #include "SVGEllipseElement.h" -#include "SVGFEBlendElement.h" -#include "SVGFEColorMatrixElement.h" -#include "SVGFEComponentTransferElement.h" -#include "SVGFECompositeElement.h" -#include "SVGFEDiffuseLightingElement.h" -#include "SVGFEDisplacementMapElement.h" -#include "SVGFEDistantLightElement.h" -#include "SVGFEFloodElement.h" -#include "SVGFEFuncAElement.h" -#include "SVGFEFuncBElement.h" -#include "SVGFEFuncGElement.h" -#include "SVGFEFuncRElement.h" -#include "SVGFEGaussianBlurElement.h" -#include "SVGFEImageElement.h" -#include "SVGFEMergeElement.h" -#include "SVGFEMergeNodeElement.h" -#include "SVGFEOffsetElement.h" -#include "SVGFEPointLightElement.h" -#include "SVGFESpecularLightingElement.h" -#include "SVGFESpotLightElement.h" -#include "SVGFETileElement.h" -#include "SVGFETurbulenceElement.h" -#include "SVGFilterElement.h" #include "SVGFontElement.h" #include "SVGFontFaceElement.h" #include "SVGFontFaceFormatElement.h" @@ -251,121 +205,6 @@ static JSNode* createSVGEllipseElementWrapper(ExecState* exec, PassRefPtr<SVGEle return CREATE_DOM_NODE_WRAPPER(exec, SVGEllipseElement, element.get()); } -static JSNode* createSVGFEBlendElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEBlendElement, element.get()); -} - -static JSNode* createSVGFEColorMatrixElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEColorMatrixElement, element.get()); -} - -static JSNode* createSVGFEComponentTransferElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEComponentTransferElement, element.get()); -} - -static JSNode* createSVGFECompositeElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFECompositeElement, element.get()); -} - -static JSNode* createSVGFEDiffuseLightingElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEDiffuseLightingElement, element.get()); -} - -static JSNode* createSVGFEDisplacementMapElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEDisplacementMapElement, element.get()); -} - -static JSNode* createSVGFEDistantLightElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEDistantLightElement, element.get()); -} - -static JSNode* createSVGFEFloodElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEFloodElement, element.get()); -} - -static JSNode* createSVGFEFuncAElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEFuncAElement, element.get()); -} - -static JSNode* createSVGFEFuncBElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEFuncBElement, element.get()); -} - -static JSNode* createSVGFEFuncGElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEFuncGElement, element.get()); -} - -static JSNode* createSVGFEFuncRElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEFuncRElement, element.get()); -} - -static JSNode* createSVGFEGaussianBlurElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEGaussianBlurElement, element.get()); -} - -static JSNode* createSVGFEImageElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEImageElement, element.get()); -} - -static JSNode* createSVGFEMergeElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEMergeElement, element.get()); -} - -static JSNode* createSVGFEMergeNodeElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEMergeNodeElement, element.get()); -} - -static JSNode* createSVGFEOffsetElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEOffsetElement, element.get()); -} - -static JSNode* createSVGFEPointLightElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFEPointLightElement, element.get()); -} - -static JSNode* createSVGFESpecularLightingElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFESpecularLightingElement, element.get()); -} - -static JSNode* createSVGFESpotLightElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFESpotLightElement, element.get()); -} - -static JSNode* createSVGFETileElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFETileElement, element.get()); -} - -static JSNode* createSVGFETurbulenceElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFETurbulenceElement, element.get()); -} - -static JSNode* createSVGFilterElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) -{ - return CREATE_DOM_NODE_WRAPPER(exec, SVGFilterElement, element.get()); -} - static JSNode* createSVGFontElementWrapper(ExecState* exec, PassRefPtr<SVGElement> element) { return CREATE_DOM_NODE_WRAPPER(exec, SVGFontElement, element.get()); @@ -563,29 +402,6 @@ JSNode* createJSSVGWrapper(ExecState* exec, PassRefPtr<SVGElement> element) map.set(defsTag.localName().impl(), createSVGDefsElementWrapper); map.set(descTag.localName().impl(), createSVGDescElementWrapper); map.set(ellipseTag.localName().impl(), createSVGEllipseElementWrapper); - map.set(feBlendTag.localName().impl(), createSVGFEBlendElementWrapper); - map.set(feColorMatrixTag.localName().impl(), createSVGFEColorMatrixElementWrapper); - map.set(feComponentTransferTag.localName().impl(), createSVGFEComponentTransferElementWrapper); - map.set(feCompositeTag.localName().impl(), createSVGFECompositeElementWrapper); - map.set(feDiffuseLightingTag.localName().impl(), createSVGFEDiffuseLightingElementWrapper); - map.set(feDisplacementMapTag.localName().impl(), createSVGFEDisplacementMapElementWrapper); - map.set(feDistantLightTag.localName().impl(), createSVGFEDistantLightElementWrapper); - map.set(feFloodTag.localName().impl(), createSVGFEFloodElementWrapper); - map.set(feFuncATag.localName().impl(), createSVGFEFuncAElementWrapper); - map.set(feFuncBTag.localName().impl(), createSVGFEFuncBElementWrapper); - map.set(feFuncGTag.localName().impl(), createSVGFEFuncGElementWrapper); - map.set(feFuncRTag.localName().impl(), createSVGFEFuncRElementWrapper); - map.set(feGaussianBlurTag.localName().impl(), createSVGFEGaussianBlurElementWrapper); - map.set(feImageTag.localName().impl(), createSVGFEImageElementWrapper); - map.set(feMergeTag.localName().impl(), createSVGFEMergeElementWrapper); - map.set(feMergeNodeTag.localName().impl(), createSVGFEMergeNodeElementWrapper); - map.set(feOffsetTag.localName().impl(), createSVGFEOffsetElementWrapper); - map.set(fePointLightTag.localName().impl(), createSVGFEPointLightElementWrapper); - map.set(feSpecularLightingTag.localName().impl(), createSVGFESpecularLightingElementWrapper); - map.set(feSpotLightTag.localName().impl(), createSVGFESpotLightElementWrapper); - map.set(feTileTag.localName().impl(), createSVGFETileElementWrapper); - map.set(feTurbulenceTag.localName().impl(), createSVGFETurbulenceElementWrapper); - map.set(filterTag.localName().impl(), createSVGFilterElementWrapper); map.set(fontTag.localName().impl(), createSVGFontElementWrapper); map.set(font_faceTag.localName().impl(), createSVGFontFaceElementWrapper); map.set(font_face_formatTag.localName().impl(), createSVGFontFaceFormatElementWrapper); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGEllipseElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGEllipseElement.cpp index 94fd5a38c8..435db96563 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGEllipseElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGEllipseElement.cpp @@ -53,7 +53,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGEllipseElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGEllipseElement); /* Hash table */ @@ -106,9 +106,9 @@ static const HashTable JSSVGEllipseElementPrototypeTable = const ClassInfo JSSVGEllipseElementPrototype::s_info = { "SVGEllipseElementPrototype", 0, &JSSVGEllipseElementPrototypeTable, 0 }; -JSObject* JSSVGEllipseElementPrototype::self(ExecState* exec) +JSObject* JSSVGEllipseElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGEllipseElement>(exec); + return getDOMPrototype<JSSVGEllipseElement>(exec, globalObject); } bool JSSVGEllipseElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -123,9 +123,9 @@ JSSVGEllipseElement::JSSVGEllipseElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSSVGEllipseElement::createPrototype(ExecState* exec) +JSObject* JSSVGEllipseElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGEllipseElementPrototype(JSSVGEllipseElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGEllipseElementPrototype(JSSVGEllipseElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGEllipseElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -133,193 +133,214 @@ bool JSSVGEllipseElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGEllipseElement, Base>(exec, &JSSVGEllipseElementTable, this, propertyName, slot); } -JSValuePtr jsSVGEllipseElementCx(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGEllipseElementCx(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->cxAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGEllipseElementCy(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGEllipseElementCy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->cyAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGEllipseElementRx(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGEllipseElementRx(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->rxAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGEllipseElementRy(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGEllipseElementRy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->ryAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGEllipseElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGEllipseElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGEllipseElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGEllipseElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGEllipseElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGEllipseElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGEllipseElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGEllipseElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGEllipseElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGEllipseElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGEllipseElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGEllipseElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGEllipseElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGEllipseElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGEllipseElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGEllipseElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGEllipseElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGEllipseElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->transformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGEllipseElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGEllipseElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGEllipseElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGEllipseElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -void JSSVGEllipseElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGEllipseElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGEllipseElement, Base>(exec, propertyName, value, &JSSVGEllipseElementTable, this, slot); } -void setJSSVGEllipseElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGEllipseElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGEllipseElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGEllipseElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(static_cast<JSSVGEllipseElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGEllipseElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGEllipseElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGEllipseElement::s_info)) return throwError(exec, TypeError); JSSVGEllipseElement* castedThisObj = static_cast<JSSVGEllipseElement*>(asObject(thisValue)); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGEllipseElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGEllipseElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGEllipseElement::s_info)) return throwError(exec, TypeError); JSSVGEllipseElement* castedThisObj = static_cast<JSSVGEllipseElement*>(asObject(thisValue)); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } -JSValuePtr jsSVGEllipseElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGEllipseElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGEllipseElement::s_info)) return throwError(exec, TypeError); JSSVGEllipseElement* castedThisObj = static_cast<JSSVGEllipseElement*>(asObject(thisValue)); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGEllipseElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGEllipseElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGEllipseElement::s_info)) return throwError(exec, TypeError); JSSVGEllipseElement* castedThisObj = static_cast<JSSVGEllipseElement*>(asObject(thisValue)); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGEllipseElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGEllipseElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGEllipseElement::s_info)) return throwError(exec, TypeError); JSSVGEllipseElement* castedThisObj = static_cast<JSSVGEllipseElement*>(asObject(thisValue)); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGEllipseElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGEllipseElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGEllipseElement::s_info)) return throwError(exec, TypeError); JSSVGEllipseElement* castedThisObj = static_cast<JSSVGEllipseElement*>(asObject(thisValue)); SVGEllipseElement* imp = static_cast<SVGEllipseElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGEllipseElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGEllipseElement.h index 6533def069..7dd50fa029 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGEllipseElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGEllipseElement.h @@ -34,13 +34,13 @@ class JSSVGEllipseElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGEllipseElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGEllipseElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGEllipseElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,31 +64,31 @@ public: // Functions -JSC::JSValuePtr jsSVGEllipseElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGEllipseElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGEllipseElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGEllipseElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGEllipseElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGEllipseElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGEllipseElementCx(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGEllipseElementCy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGEllipseElementRx(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGEllipseElementRy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGEllipseElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGEllipseElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGEllipseElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGEllipseElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGEllipseElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGEllipseElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGEllipseElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGEllipseElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGEllipseElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGEllipseElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGEllipseElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGEllipseElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGEllipseElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGEllipseElementCx(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGEllipseElementCy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGEllipseElementRx(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGEllipseElementRy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGEllipseElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGEllipseElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGEllipseElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGEllipseElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGEllipseElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGEllipseElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGEllipseElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGEllipseElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGEllipseElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGEllipseElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGEllipseElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGEllipseElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGEllipseElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGException.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGException.cpp index 5b0980f525..a3eccbd27f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGException.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGException.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGException) +ASSERT_CLASS_FITS_IN_CELL(JSSVGException); /* Hash table */ @@ -81,13 +81,13 @@ public: JSSVGExceptionConstructor(ExecState* exec) : DOMObject(JSSVGExceptionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGExceptionPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGExceptionPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -120,9 +120,9 @@ static const HashTable JSSVGExceptionPrototypeTable = const ClassInfo JSSVGExceptionPrototype::s_info = { "SVGExceptionPrototype", 0, &JSSVGExceptionPrototypeTable, 0 }; -JSObject* JSSVGExceptionPrototype::self(ExecState* exec) +JSObject* JSSVGExceptionPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGException>(exec); + return getDOMPrototype<JSSVGException>(exec, globalObject); } bool JSSVGExceptionPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -142,12 +142,11 @@ JSSVGException::JSSVGException(PassRefPtr<Structure> structure, PassRefPtr<SVGEx JSSVGException::~JSSVGException() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGException::createPrototype(ExecState* exec) +JSObject* JSSVGException::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGExceptionPrototype(JSSVGExceptionPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGExceptionPrototype(JSSVGExceptionPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGException::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -155,69 +154,73 @@ bool JSSVGException::getOwnPropertySlot(ExecState* exec, const Identifier& prope return getStaticValueSlot<JSSVGException, Base>(exec, &JSSVGExceptionTable, this, propertyName, slot); } -JSValuePtr jsSVGExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGException* imp = static_cast<SVGException*>(static_cast<JSSVGException*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->code()); } -JSValuePtr jsSVGExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGException* imp = static_cast<SVGException*>(static_cast<JSSVGException*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsSVGExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGException* imp = static_cast<SVGException*>(static_cast<JSSVGException*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->message()); } -JSValuePtr jsSVGExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGException*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSSVGException::getConstructor(ExecState* exec) +JSValue JSSVGException::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGExceptionConstructor>(exec); } -JSValuePtr jsSVGExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGException::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGException::s_info)) return throwError(exec, TypeError); JSSVGException* castedThisObj = static_cast<JSSVGException*>(asObject(thisValue)); SVGException* imp = static_cast<SVGException*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsString(exec, imp->toString()); + JSC::JSValue result = jsString(exec, imp->toString()); return result; } // Constant getters -JSValuePtr jsSVGExceptionSVG_WRONG_TYPE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGExceptionSVG_WRONG_TYPE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGExceptionSVG_INVALID_VALUE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGExceptionSVG_INVALID_VALUE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGExceptionSVG_MATRIX_NOT_INVERTABLE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGExceptionSVG_MATRIX_NOT_INVERTABLE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGException* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGException* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGException>(exec, object, context); } -SVGException* toSVGException(JSC::JSValuePtr value) +SVGException* toSVGException(JSC::JSValue value) { - return value->isObject(&JSSVGException::s_info) ? static_cast<JSSVGException*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGException::s_info) ? static_cast<JSSVGException*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGException.h b/src/3rdparty/webkit/WebCore/generated/JSSVGException.h index 02dfef7f61..374d2e6ac9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGException.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGException.h @@ -37,17 +37,17 @@ class JSSVGException : public DOMObject { public: JSSVGException(PassRefPtr<JSC::Structure>, PassRefPtr<SVGException>, SVGElement* context); virtual ~JSSVGException(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); SVGException* impl() const { return m_impl.get(); } SVGElement* context() const { return m_context.get(); } @@ -56,16 +56,17 @@ private: RefPtr<SVGException > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGException*, SVGElement* context); -SVGException* toSVGException(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGException*, SVGElement* context); +SVGException* toSVGException(JSC::JSValue); class JSSVGExceptionPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -74,18 +75,18 @@ public: // Functions -JSC::JSValuePtr jsSVGExceptionPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGExceptionPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGExceptionCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGExceptionName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGExceptionMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGExceptionCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGExceptionName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGExceptionMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGExceptionSVG_WRONG_TYPE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGExceptionSVG_INVALID_VALUE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGExceptionSVG_MATRIX_NOT_INVERTABLE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGExceptionSVG_WRONG_TYPE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGExceptionSVG_INVALID_VALUE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGExceptionSVG_MATRIX_NOT_INVERTABLE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEBlendElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEBlendElement.cpp index 0442457cea..fd3bc91291 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEBlendElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEBlendElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEBlendElement.h" @@ -45,7 +45,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEBlendElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEBlendElement); /* Hash table */ @@ -97,13 +97,13 @@ public: JSSVGFEBlendElementConstructor(ExecState* exec) : DOMObject(JSSVGFEBlendElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGFEBlendElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGFEBlendElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -139,9 +139,9 @@ static const HashTable JSSVGFEBlendElementPrototypeTable = const ClassInfo JSSVGFEBlendElementPrototype::s_info = { "SVGFEBlendElementPrototype", 0, &JSSVGFEBlendElementPrototypeTable, 0 }; -JSObject* JSSVGFEBlendElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEBlendElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEBlendElement>(exec); + return getDOMPrototype<JSSVGFEBlendElement>(exec, globalObject); } bool JSSVGFEBlendElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -156,9 +156,9 @@ JSSVGFEBlendElement::JSSVGFEBlendElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSSVGFEBlendElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEBlendElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEBlendElementPrototype(JSSVGFEBlendElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFEBlendElementPrototype(JSSVGFEBlendElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFEBlendElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -166,125 +166,136 @@ bool JSSVGFEBlendElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGFEBlendElement, Base>(exec, &JSSVGFEBlendElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFEBlendElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEBlendElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEBlendElement* imp = static_cast<SVGFEBlendElement*>(static_cast<JSSVGFEBlendElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->in1Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEBlendElementIn2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEBlendElementIn2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEBlendElement* imp = static_cast<SVGFEBlendElement*>(static_cast<JSSVGFEBlendElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->in2Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEBlendElementMode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEBlendElementMode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEBlendElement* imp = static_cast<SVGFEBlendElement*>(static_cast<JSSVGFEBlendElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->modeAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEBlendElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEBlendElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEBlendElement* imp = static_cast<SVGFEBlendElement*>(static_cast<JSSVGFEBlendElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEBlendElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEBlendElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEBlendElement* imp = static_cast<SVGFEBlendElement*>(static_cast<JSSVGFEBlendElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEBlendElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEBlendElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEBlendElement* imp = static_cast<SVGFEBlendElement*>(static_cast<JSSVGFEBlendElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEBlendElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEBlendElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEBlendElement* imp = static_cast<SVGFEBlendElement*>(static_cast<JSSVGFEBlendElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEBlendElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEBlendElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEBlendElement* imp = static_cast<SVGFEBlendElement*>(static_cast<JSSVGFEBlendElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->resultAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEBlendElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEBlendElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEBlendElement* imp = static_cast<SVGFEBlendElement*>(static_cast<JSSVGFEBlendElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEBlendElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEBlendElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEBlendElement* imp = static_cast<SVGFEBlendElement*>(static_cast<JSSVGFEBlendElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGFEBlendElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEBlendElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGFEBlendElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSSVGFEBlendElement::getConstructor(ExecState* exec) +JSValue JSSVGFEBlendElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGFEBlendElementConstructor>(exec); } -JSValuePtr jsSVGFEBlendElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGFEBlendElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFEBlendElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFEBlendElement::s_info)) return throwError(exec, TypeError); JSSVGFEBlendElement* castedThisObj = static_cast<JSSVGFEBlendElement*>(asObject(thisValue)); SVGFEBlendElement* imp = static_cast<SVGFEBlendElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } // Constant getters -JSValuePtr jsSVGFEBlendElementSVG_FEBLEND_MODE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFEBlendElementSVG_FEBLEND_MODE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGFEBlendElementSVG_FEBLEND_MODE_NORMAL(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFEBlendElementSVG_FEBLEND_MODE_NORMAL(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGFEBlendElementSVG_FEBLEND_MODE_MULTIPLY(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFEBlendElementSVG_FEBLEND_MODE_MULTIPLY(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGFEBlendElementSVG_FEBLEND_MODE_SCREEN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFEBlendElementSVG_FEBLEND_MODE_SCREEN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsSVGFEBlendElementSVG_FEBLEND_MODE_DARKEN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFEBlendElementSVG_FEBLEND_MODE_DARKEN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSValuePtr jsSVGFEBlendElementSVG_FEBLEND_MODE_LIGHTEN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFEBlendElementSVG_FEBLEND_MODE_LIGHTEN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(5)); } @@ -292,4 +303,4 @@ JSValuePtr jsSVGFEBlendElementSVG_FEBLEND_MODE_LIGHTEN(ExecState* exec, const Id } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEBlendElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEBlendElement.h index cf5956a301..a817f303a0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEBlendElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEBlendElement.h @@ -22,7 +22,7 @@ #define JSSVGFEBlendElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,27 +34,28 @@ class JSSVGFEBlendElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFEBlendElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEBlendElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSSVGFEBlendElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,31 +64,31 @@ public: // Functions -JSC::JSValuePtr jsSVGFEBlendElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFEBlendElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGFEBlendElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEBlendElementIn2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEBlendElementMode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEBlendElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEBlendElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEBlendElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEBlendElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEBlendElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEBlendElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEBlendElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEBlendElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementIn2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementMode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGFEBlendElementSVG_FEBLEND_MODE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEBlendElementSVG_FEBLEND_MODE_NORMAL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEBlendElementSVG_FEBLEND_MODE_MULTIPLY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEBlendElementSVG_FEBLEND_MODE_SCREEN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEBlendElementSVG_FEBLEND_MODE_DARKEN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEBlendElementSVG_FEBLEND_MODE_LIGHTEN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementSVG_FEBLEND_MODE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementSVG_FEBLEND_MODE_NORMAL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementSVG_FEBLEND_MODE_MULTIPLY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementSVG_FEBLEND_MODE_SCREEN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementSVG_FEBLEND_MODE_DARKEN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEBlendElementSVG_FEBLEND_MODE_LIGHTEN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEColorMatrixElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEColorMatrixElement.cpp index 92c28c92bc..12af6e8e71 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEColorMatrixElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEColorMatrixElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEColorMatrixElement.h" @@ -46,7 +46,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEColorMatrixElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEColorMatrixElement); /* Hash table */ @@ -97,13 +97,13 @@ public: JSSVGFEColorMatrixElementConstructor(ExecState* exec) : DOMObject(JSSVGFEColorMatrixElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGFEColorMatrixElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGFEColorMatrixElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -138,9 +138,9 @@ static const HashTable JSSVGFEColorMatrixElementPrototypeTable = const ClassInfo JSSVGFEColorMatrixElementPrototype::s_info = { "SVGFEColorMatrixElementPrototype", 0, &JSSVGFEColorMatrixElementPrototypeTable, 0 }; -JSObject* JSSVGFEColorMatrixElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEColorMatrixElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEColorMatrixElement>(exec); + return getDOMPrototype<JSSVGFEColorMatrixElement>(exec, globalObject); } bool JSSVGFEColorMatrixElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -155,9 +155,9 @@ JSSVGFEColorMatrixElement::JSSVGFEColorMatrixElement(PassRefPtr<Structure> struc { } -JSObject* JSSVGFEColorMatrixElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEColorMatrixElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEColorMatrixElementPrototype(JSSVGFEColorMatrixElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFEColorMatrixElementPrototype(JSSVGFEColorMatrixElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFEColorMatrixElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -165,120 +165,131 @@ bool JSSVGFEColorMatrixElement::getOwnPropertySlot(ExecState* exec, const Identi return getStaticValueSlot<JSSVGFEColorMatrixElement, Base>(exec, &JSSVGFEColorMatrixElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFEColorMatrixElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEColorMatrixElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEColorMatrixElement* imp = static_cast<SVGFEColorMatrixElement*>(static_cast<JSSVGFEColorMatrixElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->in1Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEColorMatrixElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEColorMatrixElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEColorMatrixElement* imp = static_cast<SVGFEColorMatrixElement*>(static_cast<JSSVGFEColorMatrixElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->typeAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEColorMatrixElementValues(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEColorMatrixElementValues(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEColorMatrixElement* imp = static_cast<SVGFEColorMatrixElement*>(static_cast<JSSVGFEColorMatrixElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumberList> obj = imp->valuesAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEColorMatrixElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEColorMatrixElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEColorMatrixElement* imp = static_cast<SVGFEColorMatrixElement*>(static_cast<JSSVGFEColorMatrixElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEColorMatrixElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEColorMatrixElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEColorMatrixElement* imp = static_cast<SVGFEColorMatrixElement*>(static_cast<JSSVGFEColorMatrixElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEColorMatrixElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEColorMatrixElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEColorMatrixElement* imp = static_cast<SVGFEColorMatrixElement*>(static_cast<JSSVGFEColorMatrixElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEColorMatrixElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEColorMatrixElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEColorMatrixElement* imp = static_cast<SVGFEColorMatrixElement*>(static_cast<JSSVGFEColorMatrixElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEColorMatrixElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEColorMatrixElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEColorMatrixElement* imp = static_cast<SVGFEColorMatrixElement*>(static_cast<JSSVGFEColorMatrixElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->resultAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEColorMatrixElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEColorMatrixElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEColorMatrixElement* imp = static_cast<SVGFEColorMatrixElement*>(static_cast<JSSVGFEColorMatrixElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEColorMatrixElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEColorMatrixElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEColorMatrixElement* imp = static_cast<SVGFEColorMatrixElement*>(static_cast<JSSVGFEColorMatrixElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGFEColorMatrixElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEColorMatrixElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGFEColorMatrixElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSSVGFEColorMatrixElement::getConstructor(ExecState* exec) +JSValue JSSVGFEColorMatrixElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGFEColorMatrixElementConstructor>(exec); } -JSValuePtr jsSVGFEColorMatrixElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGFEColorMatrixElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFEColorMatrixElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFEColorMatrixElement::s_info)) return throwError(exec, TypeError); JSSVGFEColorMatrixElement* castedThisObj = static_cast<JSSVGFEColorMatrixElement*>(asObject(thisValue)); SVGFEColorMatrixElement* imp = static_cast<SVGFEColorMatrixElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } // Constant getters -JSValuePtr jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_MATRIX(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_MATRIX(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_SATURATE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_SATURATE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_HUEROTATE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_HUEROTATE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } @@ -286,4 +297,4 @@ JSValuePtr jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA(Exec } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEColorMatrixElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEColorMatrixElement.h index ff20cd0c6c..29dcd58915 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEColorMatrixElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEColorMatrixElement.h @@ -22,7 +22,7 @@ #define JSSVGFEColorMatrixElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,27 +34,28 @@ class JSSVGFEColorMatrixElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFEColorMatrixElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEColorMatrixElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSSVGFEColorMatrixElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,30 +64,30 @@ public: // Functions -JSC::JSValuePtr jsSVGFEColorMatrixElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFEColorMatrixElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGFEColorMatrixElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEColorMatrixElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEColorMatrixElementValues(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEColorMatrixElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEColorMatrixElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEColorMatrixElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEColorMatrixElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEColorMatrixElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEColorMatrixElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEColorMatrixElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEColorMatrixElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEColorMatrixElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEColorMatrixElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEColorMatrixElementValues(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEColorMatrixElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEColorMatrixElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEColorMatrixElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEColorMatrixElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEColorMatrixElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEColorMatrixElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEColorMatrixElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEColorMatrixElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_MATRIX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_SATURATE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_HUEROTATE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_MATRIX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_SATURATE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_HUEROTATE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEColorMatrixElementSVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEComponentTransferElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEComponentTransferElement.cpp index 14099ec7e1..bbb07e7234 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEComponentTransferElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEComponentTransferElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEComponentTransferElement.h" @@ -43,7 +43,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEComponentTransferElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEComponentTransferElement); /* Hash table */ @@ -84,9 +84,9 @@ static const HashTable JSSVGFEComponentTransferElementPrototypeTable = const ClassInfo JSSVGFEComponentTransferElementPrototype::s_info = { "SVGFEComponentTransferElementPrototype", 0, &JSSVGFEComponentTransferElementPrototypeTable, 0 }; -JSObject* JSSVGFEComponentTransferElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEComponentTransferElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEComponentTransferElement>(exec); + return getDOMPrototype<JSSVGFEComponentTransferElement>(exec, globalObject); } bool JSSVGFEComponentTransferElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -101,9 +101,9 @@ JSSVGFEComponentTransferElement::JSSVGFEComponentTransferElement(PassRefPtr<Stru { } -JSObject* JSSVGFEComponentTransferElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEComponentTransferElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEComponentTransferElementPrototype(JSSVGFEComponentTransferElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFEComponentTransferElementPrototype(JSSVGFEComponentTransferElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFEComponentTransferElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -111,75 +111,84 @@ bool JSSVGFEComponentTransferElement::getOwnPropertySlot(ExecState* exec, const return getStaticValueSlot<JSSVGFEComponentTransferElement, Base>(exec, &JSSVGFEComponentTransferElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFEComponentTransferElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEComponentTransferElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEComponentTransferElement* imp = static_cast<SVGFEComponentTransferElement*>(static_cast<JSSVGFEComponentTransferElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->in1Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEComponentTransferElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEComponentTransferElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEComponentTransferElement* imp = static_cast<SVGFEComponentTransferElement*>(static_cast<JSSVGFEComponentTransferElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEComponentTransferElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEComponentTransferElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEComponentTransferElement* imp = static_cast<SVGFEComponentTransferElement*>(static_cast<JSSVGFEComponentTransferElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEComponentTransferElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEComponentTransferElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEComponentTransferElement* imp = static_cast<SVGFEComponentTransferElement*>(static_cast<JSSVGFEComponentTransferElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEComponentTransferElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEComponentTransferElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEComponentTransferElement* imp = static_cast<SVGFEComponentTransferElement*>(static_cast<JSSVGFEComponentTransferElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEComponentTransferElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEComponentTransferElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEComponentTransferElement* imp = static_cast<SVGFEComponentTransferElement*>(static_cast<JSSVGFEComponentTransferElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->resultAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEComponentTransferElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEComponentTransferElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEComponentTransferElement* imp = static_cast<SVGFEComponentTransferElement*>(static_cast<JSSVGFEComponentTransferElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEComponentTransferElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEComponentTransferElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEComponentTransferElement* imp = static_cast<SVGFEComponentTransferElement*>(static_cast<JSSVGFEComponentTransferElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGFEComponentTransferElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGFEComponentTransferElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFEComponentTransferElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFEComponentTransferElement::s_info)) return throwError(exec, TypeError); JSSVGFEComponentTransferElement* castedThisObj = static_cast<JSSVGFEComponentTransferElement*>(asObject(thisValue)); SVGFEComponentTransferElement* imp = static_cast<SVGFEComponentTransferElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEComponentTransferElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEComponentTransferElement.h index 1638af4237..ba98d4198f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEComponentTransferElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEComponentTransferElement.h @@ -22,7 +22,7 @@ #define JSSVGFEComponentTransferElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,12 +34,12 @@ class JSSVGFEComponentTransferElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFEComponentTransferElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEComponentTransferElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,12 +48,13 @@ public: class JSSVGFEComponentTransferElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -62,20 +63,20 @@ public: // Functions -JSC::JSValuePtr jsSVGFEComponentTransferElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFEComponentTransferElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGFEComponentTransferElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEComponentTransferElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEComponentTransferElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEComponentTransferElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEComponentTransferElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEComponentTransferElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEComponentTransferElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEComponentTransferElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEComponentTransferElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEComponentTransferElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEComponentTransferElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEComponentTransferElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEComponentTransferElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEComponentTransferElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEComponentTransferElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEComponentTransferElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFECompositeElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFECompositeElement.cpp index 88f42e6a76..3a05a50d08 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFECompositeElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFECompositeElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFECompositeElement.h" @@ -46,7 +46,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFECompositeElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFECompositeElement); /* Hash table */ @@ -103,13 +103,13 @@ public: JSSVGFECompositeElementConstructor(ExecState* exec) : DOMObject(JSSVGFECompositeElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGFECompositeElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGFECompositeElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -146,9 +146,9 @@ static const HashTable JSSVGFECompositeElementPrototypeTable = const ClassInfo JSSVGFECompositeElementPrototype::s_info = { "SVGFECompositeElementPrototype", 0, &JSSVGFECompositeElementPrototypeTable, 0 }; -JSObject* JSSVGFECompositeElementPrototype::self(ExecState* exec) +JSObject* JSSVGFECompositeElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFECompositeElement>(exec); + return getDOMPrototype<JSSVGFECompositeElement>(exec, globalObject); } bool JSSVGFECompositeElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -163,9 +163,9 @@ JSSVGFECompositeElement::JSSVGFECompositeElement(PassRefPtr<Structure> structure { } -JSObject* JSSVGFECompositeElement::createPrototype(ExecState* exec) +JSObject* JSSVGFECompositeElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFECompositeElementPrototype(JSSVGFECompositeElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFECompositeElementPrototype(JSSVGFECompositeElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFECompositeElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -173,158 +173,173 @@ bool JSSVGFECompositeElement::getOwnPropertySlot(ExecState* exec, const Identifi return getStaticValueSlot<JSSVGFECompositeElement, Base>(exec, &JSSVGFECompositeElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFECompositeElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFECompositeElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFECompositeElement* imp = static_cast<SVGFECompositeElement*>(static_cast<JSSVGFECompositeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->in1Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFECompositeElementIn2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFECompositeElementIn2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFECompositeElement* imp = static_cast<SVGFECompositeElement*>(static_cast<JSSVGFECompositeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->in2Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFECompositeElement_operator(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFECompositeElement_operator(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFECompositeElement* imp = static_cast<SVGFECompositeElement*>(static_cast<JSSVGFECompositeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->_operatorAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFECompositeElementK1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFECompositeElementK1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFECompositeElement* imp = static_cast<SVGFECompositeElement*>(static_cast<JSSVGFECompositeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->k1Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFECompositeElementK2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFECompositeElementK2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFECompositeElement* imp = static_cast<SVGFECompositeElement*>(static_cast<JSSVGFECompositeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->k2Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFECompositeElementK3(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFECompositeElementK3(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFECompositeElement* imp = static_cast<SVGFECompositeElement*>(static_cast<JSSVGFECompositeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->k3Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFECompositeElementK4(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFECompositeElementK4(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFECompositeElement* imp = static_cast<SVGFECompositeElement*>(static_cast<JSSVGFECompositeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->k4Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFECompositeElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFECompositeElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFECompositeElement* imp = static_cast<SVGFECompositeElement*>(static_cast<JSSVGFECompositeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFECompositeElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFECompositeElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFECompositeElement* imp = static_cast<SVGFECompositeElement*>(static_cast<JSSVGFECompositeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFECompositeElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFECompositeElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFECompositeElement* imp = static_cast<SVGFECompositeElement*>(static_cast<JSSVGFECompositeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFECompositeElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFECompositeElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFECompositeElement* imp = static_cast<SVGFECompositeElement*>(static_cast<JSSVGFECompositeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFECompositeElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFECompositeElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFECompositeElement* imp = static_cast<SVGFECompositeElement*>(static_cast<JSSVGFECompositeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->resultAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFECompositeElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFECompositeElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFECompositeElement* imp = static_cast<SVGFECompositeElement*>(static_cast<JSSVGFECompositeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFECompositeElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFECompositeElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFECompositeElement* imp = static_cast<SVGFECompositeElement*>(static_cast<JSSVGFECompositeElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGFECompositeElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFECompositeElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGFECompositeElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSSVGFECompositeElement::getConstructor(ExecState* exec) +JSValue JSSVGFECompositeElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGFECompositeElementConstructor>(exec); } -JSValuePtr jsSVGFECompositeElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGFECompositeElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFECompositeElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFECompositeElement::s_info)) return throwError(exec, TypeError); JSSVGFECompositeElement* castedThisObj = static_cast<JSSVGFECompositeElement*>(asObject(thisValue)); SVGFECompositeElement* imp = static_cast<SVGFECompositeElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } // Constant getters -JSValuePtr jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_OVER(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_OVER(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_IN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_IN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_OUT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_OUT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_ATOP(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_ATOP(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSValuePtr jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_XOR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_XOR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(5)); } -JSValuePtr jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_ARITHMETIC(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_ARITHMETIC(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(6)); } @@ -332,4 +347,4 @@ JSValuePtr jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_ARITHMETIC(ExecState* } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFECompositeElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFECompositeElement.h index 8da510c0a4..5d267b7bcb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFECompositeElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFECompositeElement.h @@ -22,7 +22,7 @@ #define JSSVGFECompositeElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,27 +34,28 @@ class JSSVGFECompositeElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFECompositeElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFECompositeElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSSVGFECompositeElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,36 +64,36 @@ public: // Functions -JSC::JSValuePtr jsSVGFECompositeElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFECompositeElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGFECompositeElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementIn2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElement_operator(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementK1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementK2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementK3(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementK4(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementIn2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElement_operator(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementK1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementK2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementK3(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementK4(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_OVER(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_IN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_OUT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_ATOP(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_XOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_ARITHMETIC(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_OVER(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_IN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_OUT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_ATOP(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_XOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFECompositeElementSVG_FECOMPOSITE_OPERATOR_ARITHMETIC(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDiffuseLightingElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDiffuseLightingElement.cpp index 769ab7815d..d049fa1e13 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDiffuseLightingElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDiffuseLightingElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEDiffuseLightingElement.h" @@ -44,7 +44,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEDiffuseLightingElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEDiffuseLightingElement); /* Hash table */ @@ -89,9 +89,9 @@ static const HashTable JSSVGFEDiffuseLightingElementPrototypeTable = const ClassInfo JSSVGFEDiffuseLightingElementPrototype::s_info = { "SVGFEDiffuseLightingElementPrototype", 0, &JSSVGFEDiffuseLightingElementPrototypeTable, 0 }; -JSObject* JSSVGFEDiffuseLightingElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEDiffuseLightingElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEDiffuseLightingElement>(exec); + return getDOMPrototype<JSSVGFEDiffuseLightingElement>(exec, globalObject); } bool JSSVGFEDiffuseLightingElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -106,9 +106,9 @@ JSSVGFEDiffuseLightingElement::JSSVGFEDiffuseLightingElement(PassRefPtr<Structur { } -JSObject* JSSVGFEDiffuseLightingElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEDiffuseLightingElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEDiffuseLightingElementPrototype(JSSVGFEDiffuseLightingElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFEDiffuseLightingElementPrototype(JSSVGFEDiffuseLightingElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFEDiffuseLightingElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -116,103 +116,116 @@ bool JSSVGFEDiffuseLightingElement::getOwnPropertySlot(ExecState* exec, const Id return getStaticValueSlot<JSSVGFEDiffuseLightingElement, Base>(exec, &JSSVGFEDiffuseLightingElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFEDiffuseLightingElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDiffuseLightingElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDiffuseLightingElement* imp = static_cast<SVGFEDiffuseLightingElement*>(static_cast<JSSVGFEDiffuseLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->in1Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDiffuseLightingElementSurfaceScale(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDiffuseLightingElementSurfaceScale(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDiffuseLightingElement* imp = static_cast<SVGFEDiffuseLightingElement*>(static_cast<JSSVGFEDiffuseLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->surfaceScaleAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDiffuseLightingElementDiffuseConstant(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDiffuseLightingElementDiffuseConstant(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDiffuseLightingElement* imp = static_cast<SVGFEDiffuseLightingElement*>(static_cast<JSSVGFEDiffuseLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->diffuseConstantAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDiffuseLightingElementKernelUnitLengthX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDiffuseLightingElementKernelUnitLengthX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDiffuseLightingElement* imp = static_cast<SVGFEDiffuseLightingElement*>(static_cast<JSSVGFEDiffuseLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->kernelUnitLengthXAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDiffuseLightingElementKernelUnitLengthY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDiffuseLightingElementKernelUnitLengthY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDiffuseLightingElement* imp = static_cast<SVGFEDiffuseLightingElement*>(static_cast<JSSVGFEDiffuseLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->kernelUnitLengthYAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDiffuseLightingElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDiffuseLightingElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDiffuseLightingElement* imp = static_cast<SVGFEDiffuseLightingElement*>(static_cast<JSSVGFEDiffuseLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDiffuseLightingElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDiffuseLightingElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDiffuseLightingElement* imp = static_cast<SVGFEDiffuseLightingElement*>(static_cast<JSSVGFEDiffuseLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDiffuseLightingElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDiffuseLightingElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDiffuseLightingElement* imp = static_cast<SVGFEDiffuseLightingElement*>(static_cast<JSSVGFEDiffuseLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDiffuseLightingElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDiffuseLightingElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDiffuseLightingElement* imp = static_cast<SVGFEDiffuseLightingElement*>(static_cast<JSSVGFEDiffuseLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDiffuseLightingElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDiffuseLightingElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDiffuseLightingElement* imp = static_cast<SVGFEDiffuseLightingElement*>(static_cast<JSSVGFEDiffuseLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->resultAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDiffuseLightingElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDiffuseLightingElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDiffuseLightingElement* imp = static_cast<SVGFEDiffuseLightingElement*>(static_cast<JSSVGFEDiffuseLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDiffuseLightingElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDiffuseLightingElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDiffuseLightingElement* imp = static_cast<SVGFEDiffuseLightingElement*>(static_cast<JSSVGFEDiffuseLightingElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGFEDiffuseLightingElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGFEDiffuseLightingElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFEDiffuseLightingElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFEDiffuseLightingElement::s_info)) return throwError(exec, TypeError); JSSVGFEDiffuseLightingElement* castedThisObj = static_cast<JSSVGFEDiffuseLightingElement*>(asObject(thisValue)); SVGFEDiffuseLightingElement* imp = static_cast<SVGFEDiffuseLightingElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDiffuseLightingElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDiffuseLightingElement.h index cd89cfc761..2368f2534f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDiffuseLightingElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDiffuseLightingElement.h @@ -22,7 +22,7 @@ #define JSSVGFEDiffuseLightingElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,12 +34,12 @@ class JSSVGFEDiffuseLightingElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFEDiffuseLightingElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEDiffuseLightingElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,12 +48,13 @@ public: class JSSVGFEDiffuseLightingElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -62,24 +63,24 @@ public: // Functions -JSC::JSValuePtr jsSVGFEDiffuseLightingElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFEDiffuseLightingElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGFEDiffuseLightingElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDiffuseLightingElementSurfaceScale(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDiffuseLightingElementDiffuseConstant(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDiffuseLightingElementKernelUnitLengthX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDiffuseLightingElementKernelUnitLengthY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDiffuseLightingElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDiffuseLightingElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDiffuseLightingElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDiffuseLightingElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDiffuseLightingElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDiffuseLightingElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDiffuseLightingElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDiffuseLightingElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDiffuseLightingElementSurfaceScale(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDiffuseLightingElementDiffuseConstant(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDiffuseLightingElementKernelUnitLengthX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDiffuseLightingElementKernelUnitLengthY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDiffuseLightingElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDiffuseLightingElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDiffuseLightingElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDiffuseLightingElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDiffuseLightingElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDiffuseLightingElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDiffuseLightingElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDisplacementMapElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDisplacementMapElement.cpp index 671d53dab6..74b64339a0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDisplacementMapElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDisplacementMapElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEDisplacementMapElement.h" @@ -46,7 +46,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEDisplacementMapElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEDisplacementMapElement); /* Hash table */ @@ -99,13 +99,13 @@ public: JSSVGFEDisplacementMapElementConstructor(ExecState* exec) : DOMObject(JSSVGFEDisplacementMapElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGFEDisplacementMapElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGFEDisplacementMapElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -140,9 +140,9 @@ static const HashTable JSSVGFEDisplacementMapElementPrototypeTable = const ClassInfo JSSVGFEDisplacementMapElementPrototype::s_info = { "SVGFEDisplacementMapElementPrototype", 0, &JSSVGFEDisplacementMapElementPrototypeTable, 0 }; -JSObject* JSSVGFEDisplacementMapElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEDisplacementMapElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEDisplacementMapElement>(exec); + return getDOMPrototype<JSSVGFEDisplacementMapElement>(exec, globalObject); } bool JSSVGFEDisplacementMapElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -157,9 +157,9 @@ JSSVGFEDisplacementMapElement::JSSVGFEDisplacementMapElement(PassRefPtr<Structur { } -JSObject* JSSVGFEDisplacementMapElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEDisplacementMapElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEDisplacementMapElementPrototype(JSSVGFEDisplacementMapElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFEDisplacementMapElementPrototype(JSSVGFEDisplacementMapElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFEDisplacementMapElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -167,134 +167,147 @@ bool JSSVGFEDisplacementMapElement::getOwnPropertySlot(ExecState* exec, const Id return getStaticValueSlot<JSSVGFEDisplacementMapElement, Base>(exec, &JSSVGFEDisplacementMapElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFEDisplacementMapElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDisplacementMapElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDisplacementMapElement* imp = static_cast<SVGFEDisplacementMapElement*>(static_cast<JSSVGFEDisplacementMapElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->in1Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDisplacementMapElementIn2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDisplacementMapElementIn2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDisplacementMapElement* imp = static_cast<SVGFEDisplacementMapElement*>(static_cast<JSSVGFEDisplacementMapElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->in2Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDisplacementMapElementScale(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDisplacementMapElementScale(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDisplacementMapElement* imp = static_cast<SVGFEDisplacementMapElement*>(static_cast<JSSVGFEDisplacementMapElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->scaleAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDisplacementMapElementXChannelSelector(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDisplacementMapElementXChannelSelector(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDisplacementMapElement* imp = static_cast<SVGFEDisplacementMapElement*>(static_cast<JSSVGFEDisplacementMapElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->xChannelSelectorAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDisplacementMapElementYChannelSelector(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDisplacementMapElementYChannelSelector(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDisplacementMapElement* imp = static_cast<SVGFEDisplacementMapElement*>(static_cast<JSSVGFEDisplacementMapElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->yChannelSelectorAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDisplacementMapElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDisplacementMapElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDisplacementMapElement* imp = static_cast<SVGFEDisplacementMapElement*>(static_cast<JSSVGFEDisplacementMapElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDisplacementMapElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDisplacementMapElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDisplacementMapElement* imp = static_cast<SVGFEDisplacementMapElement*>(static_cast<JSSVGFEDisplacementMapElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDisplacementMapElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDisplacementMapElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDisplacementMapElement* imp = static_cast<SVGFEDisplacementMapElement*>(static_cast<JSSVGFEDisplacementMapElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDisplacementMapElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDisplacementMapElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDisplacementMapElement* imp = static_cast<SVGFEDisplacementMapElement*>(static_cast<JSSVGFEDisplacementMapElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDisplacementMapElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDisplacementMapElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDisplacementMapElement* imp = static_cast<SVGFEDisplacementMapElement*>(static_cast<JSSVGFEDisplacementMapElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->resultAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDisplacementMapElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDisplacementMapElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDisplacementMapElement* imp = static_cast<SVGFEDisplacementMapElement*>(static_cast<JSSVGFEDisplacementMapElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDisplacementMapElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDisplacementMapElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDisplacementMapElement* imp = static_cast<SVGFEDisplacementMapElement*>(static_cast<JSSVGFEDisplacementMapElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGFEDisplacementMapElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDisplacementMapElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGFEDisplacementMapElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSSVGFEDisplacementMapElement::getConstructor(ExecState* exec) +JSValue JSSVGFEDisplacementMapElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGFEDisplacementMapElementConstructor>(exec); } -JSValuePtr jsSVGFEDisplacementMapElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGFEDisplacementMapElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFEDisplacementMapElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFEDisplacementMapElement::s_info)) return throwError(exec, TypeError); JSSVGFEDisplacementMapElement* castedThisObj = static_cast<JSSVGFEDisplacementMapElement*>(asObject(thisValue)); SVGFEDisplacementMapElement* imp = static_cast<SVGFEDisplacementMapElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } // Constant getters -JSValuePtr jsSVGFEDisplacementMapElementSVG_CHANNEL_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFEDisplacementMapElementSVG_CHANNEL_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGFEDisplacementMapElementSVG_CHANNEL_R(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFEDisplacementMapElementSVG_CHANNEL_R(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGFEDisplacementMapElementSVG_CHANNEL_G(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFEDisplacementMapElementSVG_CHANNEL_G(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGFEDisplacementMapElementSVG_CHANNEL_B(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFEDisplacementMapElementSVG_CHANNEL_B(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsSVGFEDisplacementMapElementSVG_CHANNEL_A(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFEDisplacementMapElementSVG_CHANNEL_A(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } @@ -302,4 +315,4 @@ JSValuePtr jsSVGFEDisplacementMapElementSVG_CHANNEL_A(ExecState* exec, const Ide } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDisplacementMapElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDisplacementMapElement.h index 88f5f32e58..0ee127044d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDisplacementMapElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDisplacementMapElement.h @@ -22,7 +22,7 @@ #define JSSVGFEDisplacementMapElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,27 +34,28 @@ class JSSVGFEDisplacementMapElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFEDisplacementMapElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEDisplacementMapElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSSVGFEDisplacementMapElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,32 +64,32 @@ public: // Functions -JSC::JSValuePtr jsSVGFEDisplacementMapElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFEDisplacementMapElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGFEDisplacementMapElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDisplacementMapElementIn2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDisplacementMapElementScale(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDisplacementMapElementXChannelSelector(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDisplacementMapElementYChannelSelector(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDisplacementMapElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDisplacementMapElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDisplacementMapElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDisplacementMapElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDisplacementMapElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDisplacementMapElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDisplacementMapElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDisplacementMapElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementIn2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementScale(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementXChannelSelector(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementYChannelSelector(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGFEDisplacementMapElementSVG_CHANNEL_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDisplacementMapElementSVG_CHANNEL_R(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDisplacementMapElementSVG_CHANNEL_G(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDisplacementMapElementSVG_CHANNEL_B(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDisplacementMapElementSVG_CHANNEL_A(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementSVG_CHANNEL_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementSVG_CHANNEL_R(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementSVG_CHANNEL_G(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementSVG_CHANNEL_B(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDisplacementMapElementSVG_CHANNEL_A(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDistantLightElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDistantLightElement.cpp index be849e0211..95092e46bf 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDistantLightElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDistantLightElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEDistantLightElement.h" @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEDistantLightElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEDistantLightElement); /* Hash table */ @@ -70,9 +70,9 @@ static const HashTable JSSVGFEDistantLightElementPrototypeTable = const ClassInfo JSSVGFEDistantLightElementPrototype::s_info = { "SVGFEDistantLightElementPrototype", 0, &JSSVGFEDistantLightElementPrototypeTable, 0 }; -JSObject* JSSVGFEDistantLightElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEDistantLightElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEDistantLightElement>(exec); + return getDOMPrototype<JSSVGFEDistantLightElement>(exec, globalObject); } const ClassInfo JSSVGFEDistantLightElement::s_info = { "SVGFEDistantLightElement", &JSSVGElement::s_info, &JSSVGFEDistantLightElementTable, 0 }; @@ -82,9 +82,9 @@ JSSVGFEDistantLightElement::JSSVGFEDistantLightElement(PassRefPtr<Structure> str { } -JSObject* JSSVGFEDistantLightElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEDistantLightElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEDistantLightElementPrototype(JSSVGFEDistantLightElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFEDistantLightElementPrototype(JSSVGFEDistantLightElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFEDistantLightElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -92,15 +92,17 @@ bool JSSVGFEDistantLightElement::getOwnPropertySlot(ExecState* exec, const Ident return getStaticValueSlot<JSSVGFEDistantLightElement, Base>(exec, &JSSVGFEDistantLightElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFEDistantLightElementAzimuth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDistantLightElementAzimuth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDistantLightElement* imp = static_cast<SVGFEDistantLightElement*>(static_cast<JSSVGFEDistantLightElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->azimuthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEDistantLightElementElevation(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEDistantLightElementElevation(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEDistantLightElement* imp = static_cast<SVGFEDistantLightElement*>(static_cast<JSSVGFEDistantLightElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->elevationAnimated(); return toJS(exec, obj.get(), imp); @@ -109,4 +111,4 @@ JSValuePtr jsSVGFEDistantLightElementElevation(ExecState* exec, const Identifier } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDistantLightElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDistantLightElement.h index 201f90528c..4e798c8681 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDistantLightElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDistantLightElement.h @@ -22,7 +22,7 @@ #define JSSVGFEDistantLightElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,12 +34,12 @@ class JSSVGFEDistantLightElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFEDistantLightElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEDistantLightElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,8 +48,9 @@ public: class JSSVGFEDistantLightElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGFEDistantLightElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -57,11 +58,11 @@ public: // Attributes -JSC::JSValuePtr jsSVGFEDistantLightElementAzimuth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEDistantLightElementElevation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDistantLightElementAzimuth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEDistantLightElementElevation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFloodElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFloodElement.cpp index 2d1a049920..52461a651e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFloodElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFloodElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEFloodElement.h" @@ -38,17 +38,19 @@ #include "SVGFEFloodElement.h" #include <runtime/Error.h> +#include <runtime/JSNumberCell.h> using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEFloodElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEFloodElement); /* Hash table */ -static const HashTableValue JSSVGFEFloodElementTableValues[8] = +static const HashTableValue JSSVGFEFloodElementTableValues[10] = { + { "in1", DontDelete|ReadOnly, (intptr_t)jsSVGFEFloodElementIn1, (intptr_t)0 }, { "x", DontDelete|ReadOnly, (intptr_t)jsSVGFEFloodElementX, (intptr_t)0 }, { "y", DontDelete|ReadOnly, (intptr_t)jsSVGFEFloodElementY, (intptr_t)0 }, { "width", DontDelete|ReadOnly, (intptr_t)jsSVGFEFloodElementWidth, (intptr_t)0 }, @@ -56,6 +58,7 @@ static const HashTableValue JSSVGFEFloodElementTableValues[8] = { "result", DontDelete|ReadOnly, (intptr_t)jsSVGFEFloodElementResult, (intptr_t)0 }, { "className", DontDelete|ReadOnly, (intptr_t)jsSVGFEFloodElementClassName, (intptr_t)0 }, { "style", DontDelete|ReadOnly, (intptr_t)jsSVGFEFloodElementStyle, (intptr_t)0 }, + { "constructor", DontEnum|ReadOnly, (intptr_t)jsSVGFEFloodElementConstructor, (intptr_t)0 }, { 0, 0, 0, 0 } }; @@ -63,9 +66,47 @@ static const HashTable JSSVGFEFloodElementTable = #if ENABLE(PERFECT_HASH_SIZE) { 255, JSSVGFEFloodElementTableValues, 0 }; #else - { 17, 15, JSSVGFEFloodElementTableValues, 0 }; + { 34, 31, JSSVGFEFloodElementTableValues, 0 }; #endif +/* Hash table for constructor */ + +static const HashTableValue JSSVGFEFloodElementConstructorTableValues[1] = +{ + { 0, 0, 0, 0 } +}; + +static const HashTable JSSVGFEFloodElementConstructorTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSSVGFEFloodElementConstructorTableValues, 0 }; +#else + { 1, 0, JSSVGFEFloodElementConstructorTableValues, 0 }; +#endif + +class JSSVGFEFloodElementConstructor : public DOMObject { +public: + JSSVGFEFloodElementConstructor(ExecState* exec) + : DOMObject(JSSVGFEFloodElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + { + putDirect(exec->propertyNames().prototype, JSSVGFEFloodElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + } + virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); + virtual const ClassInfo* classInfo() const { return &s_info; } + static const ClassInfo s_info; + + static PassRefPtr<Structure> createStructure(JSValue proto) + { + return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); + } +}; + +const ClassInfo JSSVGFEFloodElementConstructor::s_info = { "SVGFEFloodElementConstructor", 0, &JSSVGFEFloodElementConstructorTable, 0 }; + +bool JSSVGFEFloodElementConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot<JSSVGFEFloodElementConstructor, DOMObject>(exec, &JSSVGFEFloodElementConstructorTable, this, propertyName, slot); +} + /* Hash table for prototype */ static const HashTableValue JSSVGFEFloodElementPrototypeTableValues[2] = @@ -83,9 +124,9 @@ static const HashTable JSSVGFEFloodElementPrototypeTable = const ClassInfo JSSVGFEFloodElementPrototype::s_info = { "SVGFEFloodElementPrototype", 0, &JSSVGFEFloodElementPrototypeTable, 0 }; -JSObject* JSSVGFEFloodElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEFloodElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEFloodElement>(exec); + return getDOMPrototype<JSSVGFEFloodElement>(exec, globalObject); } bool JSSVGFEFloodElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -100,9 +141,9 @@ JSSVGFEFloodElement::JSSVGFEFloodElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSSVGFEFloodElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEFloodElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEFloodElementPrototype(JSSVGFEFloodElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFEFloodElementPrototype(JSSVGFEFloodElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFEFloodElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -110,68 +151,93 @@ bool JSSVGFEFloodElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGFEFloodElement, Base>(exec, &JSSVGFEFloodElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFEFloodElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEFloodElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + SVGFEFloodElement* imp = static_cast<SVGFEFloodElement*>(static_cast<JSSVGFEFloodElement*>(asObject(slot.slotBase()))->impl()); + RefPtr<SVGAnimatedString> obj = imp->in1Animated(); + return toJS(exec, obj.get(), imp); +} + +JSValue jsSVGFEFloodElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEFloodElement* imp = static_cast<SVGFEFloodElement*>(static_cast<JSSVGFEFloodElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEFloodElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEFloodElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEFloodElement* imp = static_cast<SVGFEFloodElement*>(static_cast<JSSVGFEFloodElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEFloodElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEFloodElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEFloodElement* imp = static_cast<SVGFEFloodElement*>(static_cast<JSSVGFEFloodElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEFloodElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEFloodElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEFloodElement* imp = static_cast<SVGFEFloodElement*>(static_cast<JSSVGFEFloodElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEFloodElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEFloodElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEFloodElement* imp = static_cast<SVGFEFloodElement*>(static_cast<JSSVGFEFloodElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->resultAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEFloodElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEFloodElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEFloodElement* imp = static_cast<SVGFEFloodElement*>(static_cast<JSSVGFEFloodElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEFloodElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEFloodElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEFloodElement* imp = static_cast<SVGFEFloodElement*>(static_cast<JSSVGFEFloodElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGFEFloodElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue jsSVGFEFloodElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + return static_cast<JSSVGFEFloodElement*>(asObject(slot.slotBase()))->getConstructor(exec); +} +JSValue JSSVGFEFloodElement::getConstructor(ExecState* exec) +{ + return getDOMConstructor<JSSVGFEFloodElementConstructor>(exec); +} + +JSValue JSC_HOST_CALL jsSVGFEFloodElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFEFloodElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFEFloodElement::s_info)) return throwError(exec, TypeError); JSSVGFEFloodElement* castedThisObj = static_cast<JSSVGFEFloodElement*>(asObject(thisValue)); SVGFEFloodElement* imp = static_cast<SVGFEFloodElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFloodElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFloodElement.h index 0423a2c886..ad0a9ea55f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFloodElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFloodElement.h @@ -22,7 +22,7 @@ #define JSSVGFEFloodElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,26 +34,28 @@ class JSSVGFEFloodElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFEFloodElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEFloodElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSSVGFEFloodElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -62,19 +64,21 @@ public: // Functions -JSC::JSValuePtr jsSVGFEFloodElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFEFloodElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGFEFloodElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEFloodElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEFloodElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEFloodElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEFloodElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEFloodElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEFloodElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEFloodElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEFloodElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEFloodElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEFloodElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEFloodElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEFloodElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEFloodElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEFloodElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEFloodElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncAElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncAElement.cpp index 90e4497789..cf954122a9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncAElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncAElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEFuncAElement.h" @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEFuncAElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEFuncAElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGFEFuncAElementPrototypeTable = const ClassInfo JSSVGFEFuncAElementPrototype::s_info = { "SVGFEFuncAElementPrototype", 0, &JSSVGFEFuncAElementPrototypeTable, 0 }; -JSObject* JSSVGFEFuncAElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEFuncAElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEFuncAElement>(exec); + return getDOMPrototype<JSSVGFEFuncAElement>(exec, globalObject); } const ClassInfo JSSVGFEFuncAElement::s_info = { "SVGFEFuncAElement", &JSSVGComponentTransferFunctionElement::s_info, 0, 0 }; @@ -65,12 +65,12 @@ JSSVGFEFuncAElement::JSSVGFEFuncAElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSSVGFEFuncAElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEFuncAElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEFuncAElementPrototype(JSSVGFEFuncAElementPrototype::createStructure(JSSVGComponentTransferFunctionElementPrototype::self(exec))); + return new (exec) JSSVGFEFuncAElementPrototype(JSSVGFEFuncAElementPrototype::createStructure(JSSVGComponentTransferFunctionElementPrototype::self(exec, globalObject))); } } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncAElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncAElement.h index 6389f343a2..a072d4fd38 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncAElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncAElement.h @@ -22,7 +22,7 @@ #define JSSVGFEFuncAElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGComponentTransferFunctionElement.h" @@ -34,7 +34,7 @@ class JSSVGFEFuncAElement : public JSSVGComponentTransferFunctionElement { typedef JSSVGComponentTransferFunctionElement Base; public: JSSVGFEFuncAElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEFuncAElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGFEFuncAElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGFEFuncAElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -52,6 +53,6 @@ public: } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncBElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncBElement.cpp index 81926d6ae3..c5a6dd7fae 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncBElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncBElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEFuncBElement.h" @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEFuncBElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEFuncBElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGFEFuncBElementPrototypeTable = const ClassInfo JSSVGFEFuncBElementPrototype::s_info = { "SVGFEFuncBElementPrototype", 0, &JSSVGFEFuncBElementPrototypeTable, 0 }; -JSObject* JSSVGFEFuncBElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEFuncBElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEFuncBElement>(exec); + return getDOMPrototype<JSSVGFEFuncBElement>(exec, globalObject); } const ClassInfo JSSVGFEFuncBElement::s_info = { "SVGFEFuncBElement", &JSSVGComponentTransferFunctionElement::s_info, 0, 0 }; @@ -65,12 +65,12 @@ JSSVGFEFuncBElement::JSSVGFEFuncBElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSSVGFEFuncBElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEFuncBElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEFuncBElementPrototype(JSSVGFEFuncBElementPrototype::createStructure(JSSVGComponentTransferFunctionElementPrototype::self(exec))); + return new (exec) JSSVGFEFuncBElementPrototype(JSSVGFEFuncBElementPrototype::createStructure(JSSVGComponentTransferFunctionElementPrototype::self(exec, globalObject))); } } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncBElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncBElement.h index 165a18846d..70cbb224f3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncBElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncBElement.h @@ -22,7 +22,7 @@ #define JSSVGFEFuncBElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGComponentTransferFunctionElement.h" @@ -34,7 +34,7 @@ class JSSVGFEFuncBElement : public JSSVGComponentTransferFunctionElement { typedef JSSVGComponentTransferFunctionElement Base; public: JSSVGFEFuncBElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEFuncBElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGFEFuncBElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGFEFuncBElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -52,6 +53,6 @@ public: } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncGElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncGElement.cpp index 539e342776..b55cfea78c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncGElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncGElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEFuncGElement.h" @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEFuncGElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEFuncGElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGFEFuncGElementPrototypeTable = const ClassInfo JSSVGFEFuncGElementPrototype::s_info = { "SVGFEFuncGElementPrototype", 0, &JSSVGFEFuncGElementPrototypeTable, 0 }; -JSObject* JSSVGFEFuncGElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEFuncGElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEFuncGElement>(exec); + return getDOMPrototype<JSSVGFEFuncGElement>(exec, globalObject); } const ClassInfo JSSVGFEFuncGElement::s_info = { "SVGFEFuncGElement", &JSSVGComponentTransferFunctionElement::s_info, 0, 0 }; @@ -65,12 +65,12 @@ JSSVGFEFuncGElement::JSSVGFEFuncGElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSSVGFEFuncGElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEFuncGElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEFuncGElementPrototype(JSSVGFEFuncGElementPrototype::createStructure(JSSVGComponentTransferFunctionElementPrototype::self(exec))); + return new (exec) JSSVGFEFuncGElementPrototype(JSSVGFEFuncGElementPrototype::createStructure(JSSVGComponentTransferFunctionElementPrototype::self(exec, globalObject))); } } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncGElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncGElement.h index aafeab6ed9..77c584f386 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncGElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncGElement.h @@ -22,7 +22,7 @@ #define JSSVGFEFuncGElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGComponentTransferFunctionElement.h" @@ -34,7 +34,7 @@ class JSSVGFEFuncGElement : public JSSVGComponentTransferFunctionElement { typedef JSSVGComponentTransferFunctionElement Base; public: JSSVGFEFuncGElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEFuncGElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGFEFuncGElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGFEFuncGElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -52,6 +53,6 @@ public: } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncRElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncRElement.cpp index 96d91884f5..c2e89941d1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncRElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncRElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEFuncRElement.h" @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEFuncRElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEFuncRElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGFEFuncRElementPrototypeTable = const ClassInfo JSSVGFEFuncRElementPrototype::s_info = { "SVGFEFuncRElementPrototype", 0, &JSSVGFEFuncRElementPrototypeTable, 0 }; -JSObject* JSSVGFEFuncRElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEFuncRElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEFuncRElement>(exec); + return getDOMPrototype<JSSVGFEFuncRElement>(exec, globalObject); } const ClassInfo JSSVGFEFuncRElement::s_info = { "SVGFEFuncRElement", &JSSVGComponentTransferFunctionElement::s_info, 0, 0 }; @@ -65,12 +65,12 @@ JSSVGFEFuncRElement::JSSVGFEFuncRElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSSVGFEFuncRElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEFuncRElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEFuncRElementPrototype(JSSVGFEFuncRElementPrototype::createStructure(JSSVGComponentTransferFunctionElementPrototype::self(exec))); + return new (exec) JSSVGFEFuncRElementPrototype(JSSVGFEFuncRElementPrototype::createStructure(JSSVGComponentTransferFunctionElementPrototype::self(exec, globalObject))); } } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncRElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncRElement.h index 03e176d150..57eb1675c0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncRElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncRElement.h @@ -22,7 +22,7 @@ #define JSSVGFEFuncRElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGComponentTransferFunctionElement.h" @@ -34,7 +34,7 @@ class JSSVGFEFuncRElement : public JSSVGComponentTransferFunctionElement { typedef JSSVGComponentTransferFunctionElement Base; public: JSSVGFEFuncRElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEFuncRElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGFEFuncRElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGFEFuncRElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -52,6 +53,6 @@ public: } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEGaussianBlurElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEGaussianBlurElement.cpp index 3640b996db..edd91eddb8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEGaussianBlurElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEGaussianBlurElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEGaussianBlurElement.h" @@ -44,7 +44,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEGaussianBlurElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEGaussianBlurElement); /* Hash table */ @@ -88,9 +88,9 @@ static const HashTable JSSVGFEGaussianBlurElementPrototypeTable = const ClassInfo JSSVGFEGaussianBlurElementPrototype::s_info = { "SVGFEGaussianBlurElementPrototype", 0, &JSSVGFEGaussianBlurElementPrototypeTable, 0 }; -JSObject* JSSVGFEGaussianBlurElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEGaussianBlurElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEGaussianBlurElement>(exec); + return getDOMPrototype<JSSVGFEGaussianBlurElement>(exec, globalObject); } bool JSSVGFEGaussianBlurElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -105,9 +105,9 @@ JSSVGFEGaussianBlurElement::JSSVGFEGaussianBlurElement(PassRefPtr<Structure> str { } -JSObject* JSSVGFEGaussianBlurElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEGaussianBlurElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEGaussianBlurElementPrototype(JSSVGFEGaussianBlurElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFEGaussianBlurElementPrototype(JSSVGFEGaussianBlurElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFEGaussianBlurElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -115,102 +115,114 @@ bool JSSVGFEGaussianBlurElement::getOwnPropertySlot(ExecState* exec, const Ident return getStaticValueSlot<JSSVGFEGaussianBlurElement, Base>(exec, &JSSVGFEGaussianBlurElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFEGaussianBlurElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEGaussianBlurElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEGaussianBlurElement* imp = static_cast<SVGFEGaussianBlurElement*>(static_cast<JSSVGFEGaussianBlurElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->in1Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEGaussianBlurElementStdDeviationX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEGaussianBlurElementStdDeviationX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEGaussianBlurElement* imp = static_cast<SVGFEGaussianBlurElement*>(static_cast<JSSVGFEGaussianBlurElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->stdDeviationXAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEGaussianBlurElementStdDeviationY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEGaussianBlurElementStdDeviationY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEGaussianBlurElement* imp = static_cast<SVGFEGaussianBlurElement*>(static_cast<JSSVGFEGaussianBlurElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->stdDeviationYAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEGaussianBlurElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEGaussianBlurElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEGaussianBlurElement* imp = static_cast<SVGFEGaussianBlurElement*>(static_cast<JSSVGFEGaussianBlurElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEGaussianBlurElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEGaussianBlurElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEGaussianBlurElement* imp = static_cast<SVGFEGaussianBlurElement*>(static_cast<JSSVGFEGaussianBlurElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEGaussianBlurElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEGaussianBlurElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEGaussianBlurElement* imp = static_cast<SVGFEGaussianBlurElement*>(static_cast<JSSVGFEGaussianBlurElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEGaussianBlurElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEGaussianBlurElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEGaussianBlurElement* imp = static_cast<SVGFEGaussianBlurElement*>(static_cast<JSSVGFEGaussianBlurElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEGaussianBlurElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEGaussianBlurElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEGaussianBlurElement* imp = static_cast<SVGFEGaussianBlurElement*>(static_cast<JSSVGFEGaussianBlurElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->resultAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEGaussianBlurElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEGaussianBlurElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEGaussianBlurElement* imp = static_cast<SVGFEGaussianBlurElement*>(static_cast<JSSVGFEGaussianBlurElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEGaussianBlurElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEGaussianBlurElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEGaussianBlurElement* imp = static_cast<SVGFEGaussianBlurElement*>(static_cast<JSSVGFEGaussianBlurElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGFEGaussianBlurElementPrototypeFunctionSetStdDeviation(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGFEGaussianBlurElementPrototypeFunctionSetStdDeviation(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFEGaussianBlurElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFEGaussianBlurElement::s_info)) return throwError(exec, TypeError); JSSVGFEGaussianBlurElement* castedThisObj = static_cast<JSSVGFEGaussianBlurElement*>(asObject(thisValue)); SVGFEGaussianBlurElement* imp = static_cast<SVGFEGaussianBlurElement*>(castedThisObj->impl()); - float stdDeviationX = args.at(exec, 0)->toFloat(exec); - float stdDeviationY = args.at(exec, 1)->toFloat(exec); + float stdDeviationX = args.at(0).toFloat(exec); + float stdDeviationY = args.at(1).toFloat(exec); imp->setStdDeviation(stdDeviationX, stdDeviationY); return jsUndefined(); } -JSValuePtr jsSVGFEGaussianBlurElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGFEGaussianBlurElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFEGaussianBlurElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFEGaussianBlurElement::s_info)) return throwError(exec, TypeError); JSSVGFEGaussianBlurElement* castedThisObj = static_cast<JSSVGFEGaussianBlurElement*>(asObject(thisValue)); SVGFEGaussianBlurElement* imp = static_cast<SVGFEGaussianBlurElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEGaussianBlurElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEGaussianBlurElement.h index 4452f50f2f..f62c21b9e1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEGaussianBlurElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEGaussianBlurElement.h @@ -22,7 +22,7 @@ #define JSSVGFEGaussianBlurElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,12 +34,12 @@ class JSSVGFEGaussianBlurElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFEGaussianBlurElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEGaussianBlurElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,12 +48,13 @@ public: class JSSVGFEGaussianBlurElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -62,23 +63,23 @@ public: // Functions -JSC::JSValuePtr jsSVGFEGaussianBlurElementPrototypeFunctionSetStdDeviation(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGFEGaussianBlurElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFEGaussianBlurElementPrototypeFunctionSetStdDeviation(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFEGaussianBlurElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGFEGaussianBlurElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEGaussianBlurElementStdDeviationX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEGaussianBlurElementStdDeviationY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEGaussianBlurElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEGaussianBlurElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEGaussianBlurElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEGaussianBlurElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEGaussianBlurElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEGaussianBlurElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEGaussianBlurElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEGaussianBlurElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEGaussianBlurElementStdDeviationX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEGaussianBlurElementStdDeviationY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEGaussianBlurElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEGaussianBlurElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEGaussianBlurElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEGaussianBlurElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEGaussianBlurElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEGaussianBlurElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEGaussianBlurElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEImageElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEImageElement.cpp index 0aa0bdd0bc..bd20a4c25e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEImageElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEImageElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEImageElement.h" @@ -46,7 +46,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEImageElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEImageElement); /* Hash table */ @@ -90,9 +90,9 @@ static const HashTable JSSVGFEImageElementPrototypeTable = const ClassInfo JSSVGFEImageElementPrototype::s_info = { "SVGFEImageElementPrototype", 0, &JSSVGFEImageElementPrototypeTable, 0 }; -JSObject* JSSVGFEImageElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEImageElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEImageElement>(exec); + return getDOMPrototype<JSSVGFEImageElement>(exec, globalObject); } bool JSSVGFEImageElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -107,9 +107,9 @@ JSSVGFEImageElement::JSSVGFEImageElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSSVGFEImageElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEImageElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEImageElementPrototype(JSSVGFEImageElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFEImageElementPrototype(JSSVGFEImageElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFEImageElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -117,111 +117,123 @@ bool JSSVGFEImageElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGFEImageElement, Base>(exec, &JSSVGFEImageElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFEImageElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEImageElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEImageElement* imp = static_cast<SVGFEImageElement*>(static_cast<JSSVGFEImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->hrefAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEImageElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEImageElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEImageElement* imp = static_cast<SVGFEImageElement*>(static_cast<JSSVGFEImageElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGFEImageElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEImageElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEImageElement* imp = static_cast<SVGFEImageElement*>(static_cast<JSSVGFEImageElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGFEImageElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEImageElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEImageElement* imp = static_cast<SVGFEImageElement*>(static_cast<JSSVGFEImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEImageElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEImageElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEImageElement* imp = static_cast<SVGFEImageElement*>(static_cast<JSSVGFEImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEImageElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEImageElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEImageElement* imp = static_cast<SVGFEImageElement*>(static_cast<JSSVGFEImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEImageElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEImageElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEImageElement* imp = static_cast<SVGFEImageElement*>(static_cast<JSSVGFEImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEImageElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEImageElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEImageElement* imp = static_cast<SVGFEImageElement*>(static_cast<JSSVGFEImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEImageElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEImageElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEImageElement* imp = static_cast<SVGFEImageElement*>(static_cast<JSSVGFEImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->resultAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEImageElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEImageElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEImageElement* imp = static_cast<SVGFEImageElement*>(static_cast<JSSVGFEImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEImageElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEImageElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEImageElement* imp = static_cast<SVGFEImageElement*>(static_cast<JSSVGFEImageElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -void JSSVGFEImageElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGFEImageElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGFEImageElement, Base>(exec, propertyName, value, &JSSVGFEImageElementTable, this, slot); } -void setJSSVGFEImageElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGFEImageElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGFEImageElement* imp = static_cast<SVGFEImageElement*>(static_cast<JSSVGFEImageElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGFEImageElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGFEImageElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGFEImageElement* imp = static_cast<SVGFEImageElement*>(static_cast<JSSVGFEImageElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGFEImageElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGFEImageElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFEImageElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFEImageElement::s_info)) return throwError(exec, TypeError); JSSVGFEImageElement* castedThisObj = static_cast<JSSVGFEImageElement*>(asObject(thisValue)); SVGFEImageElement* imp = static_cast<SVGFEImageElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEImageElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEImageElement.h index 2fa8c61772..440aee8446 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEImageElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEImageElement.h @@ -22,7 +22,7 @@ #define JSSVGFEImageElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,13 +34,13 @@ class JSSVGFEImageElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFEImageElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEImageElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGFEImageElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,25 +64,25 @@ public: // Functions -JSC::JSValuePtr jsSVGFEImageElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFEImageElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGFEImageElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEImageElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGFEImageElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGFEImageElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGFEImageElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGFEImageElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEImageElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEImageElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEImageElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEImageElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEImageElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEImageElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEImageElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEImageElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEImageElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGFEImageElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGFEImageElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGFEImageElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGFEImageElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEImageElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEImageElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEImageElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEImageElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEImageElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEImageElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEImageElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeElement.cpp index 4a5d839d25..016f6cbc21 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEMergeElement.h" @@ -43,7 +43,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEMergeElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEMergeElement); /* Hash table */ @@ -83,9 +83,9 @@ static const HashTable JSSVGFEMergeElementPrototypeTable = const ClassInfo JSSVGFEMergeElementPrototype::s_info = { "SVGFEMergeElementPrototype", 0, &JSSVGFEMergeElementPrototypeTable, 0 }; -JSObject* JSSVGFEMergeElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEMergeElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEMergeElement>(exec); + return getDOMPrototype<JSSVGFEMergeElement>(exec, globalObject); } bool JSSVGFEMergeElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -100,9 +100,9 @@ JSSVGFEMergeElement::JSSVGFEMergeElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSSVGFEMergeElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEMergeElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEMergeElementPrototype(JSSVGFEMergeElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFEMergeElementPrototype(JSSVGFEMergeElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFEMergeElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -110,68 +110,76 @@ bool JSSVGFEMergeElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGFEMergeElement, Base>(exec, &JSSVGFEMergeElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFEMergeElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEMergeElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEMergeElement* imp = static_cast<SVGFEMergeElement*>(static_cast<JSSVGFEMergeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEMergeElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEMergeElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEMergeElement* imp = static_cast<SVGFEMergeElement*>(static_cast<JSSVGFEMergeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEMergeElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEMergeElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEMergeElement* imp = static_cast<SVGFEMergeElement*>(static_cast<JSSVGFEMergeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEMergeElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEMergeElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEMergeElement* imp = static_cast<SVGFEMergeElement*>(static_cast<JSSVGFEMergeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEMergeElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEMergeElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEMergeElement* imp = static_cast<SVGFEMergeElement*>(static_cast<JSSVGFEMergeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->resultAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEMergeElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEMergeElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEMergeElement* imp = static_cast<SVGFEMergeElement*>(static_cast<JSSVGFEMergeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEMergeElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEMergeElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEMergeElement* imp = static_cast<SVGFEMergeElement*>(static_cast<JSSVGFEMergeElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGFEMergeElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGFEMergeElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFEMergeElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFEMergeElement::s_info)) return throwError(exec, TypeError); JSSVGFEMergeElement* castedThisObj = static_cast<JSSVGFEMergeElement*>(asObject(thisValue)); SVGFEMergeElement* imp = static_cast<SVGFEMergeElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeElement.h index ffd28c6013..af4517ef69 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeElement.h @@ -22,7 +22,7 @@ #define JSSVGFEMergeElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,12 +34,12 @@ class JSSVGFEMergeElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFEMergeElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEMergeElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,12 +48,13 @@ public: class JSSVGFEMergeElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -62,19 +63,19 @@ public: // Functions -JSC::JSValuePtr jsSVGFEMergeElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFEMergeElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGFEMergeElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEMergeElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEMergeElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEMergeElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEMergeElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEMergeElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEMergeElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEMergeElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEMergeElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEMergeElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEMergeElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEMergeElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEMergeElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEMergeElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeNodeElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeNodeElement.cpp index 6ea174225e..14aa4934c6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeNodeElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeNodeElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEMergeNodeElement.h" @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEMergeNodeElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEMergeNodeElement); /* Hash table */ @@ -69,9 +69,9 @@ static const HashTable JSSVGFEMergeNodeElementPrototypeTable = const ClassInfo JSSVGFEMergeNodeElementPrototype::s_info = { "SVGFEMergeNodeElementPrototype", 0, &JSSVGFEMergeNodeElementPrototypeTable, 0 }; -JSObject* JSSVGFEMergeNodeElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEMergeNodeElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEMergeNodeElement>(exec); + return getDOMPrototype<JSSVGFEMergeNodeElement>(exec, globalObject); } const ClassInfo JSSVGFEMergeNodeElement::s_info = { "SVGFEMergeNodeElement", &JSSVGElement::s_info, &JSSVGFEMergeNodeElementTable, 0 }; @@ -81,9 +81,9 @@ JSSVGFEMergeNodeElement::JSSVGFEMergeNodeElement(PassRefPtr<Structure> structure { } -JSObject* JSSVGFEMergeNodeElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEMergeNodeElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEMergeNodeElementPrototype(JSSVGFEMergeNodeElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFEMergeNodeElementPrototype(JSSVGFEMergeNodeElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFEMergeNodeElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -91,8 +91,9 @@ bool JSSVGFEMergeNodeElement::getOwnPropertySlot(ExecState* exec, const Identifi return getStaticValueSlot<JSSVGFEMergeNodeElement, Base>(exec, &JSSVGFEMergeNodeElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFEMergeNodeElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEMergeNodeElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEMergeNodeElement* imp = static_cast<SVGFEMergeNodeElement*>(static_cast<JSSVGFEMergeNodeElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->in1Animated(); return toJS(exec, obj.get(), imp); @@ -101,4 +102,4 @@ JSValuePtr jsSVGFEMergeNodeElementIn1(ExecState* exec, const Identifier&, const } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeNodeElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeNodeElement.h index 6ffab92f84..069b2d0cca 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeNodeElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeNodeElement.h @@ -22,7 +22,7 @@ #define JSSVGFEMergeNodeElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,12 +34,12 @@ class JSSVGFEMergeNodeElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFEMergeNodeElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEMergeNodeElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,8 +48,9 @@ public: class JSSVGFEMergeNodeElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGFEMergeNodeElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -57,10 +58,10 @@ public: // Attributes -JSC::JSValuePtr jsSVGFEMergeNodeElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEMergeNodeElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEOffsetElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEOffsetElement.cpp index 8582bcb051..3847b48ff9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEOffsetElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEOffsetElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEOffsetElement.h" @@ -44,7 +44,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEOffsetElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEOffsetElement); /* Hash table */ @@ -87,9 +87,9 @@ static const HashTable JSSVGFEOffsetElementPrototypeTable = const ClassInfo JSSVGFEOffsetElementPrototype::s_info = { "SVGFEOffsetElementPrototype", 0, &JSSVGFEOffsetElementPrototypeTable, 0 }; -JSObject* JSSVGFEOffsetElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEOffsetElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEOffsetElement>(exec); + return getDOMPrototype<JSSVGFEOffsetElement>(exec, globalObject); } bool JSSVGFEOffsetElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -104,9 +104,9 @@ JSSVGFEOffsetElement::JSSVGFEOffsetElement(PassRefPtr<Structure> structure, Pass { } -JSObject* JSSVGFEOffsetElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEOffsetElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEOffsetElementPrototype(JSSVGFEOffsetElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFEOffsetElementPrototype(JSSVGFEOffsetElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFEOffsetElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -114,89 +114,100 @@ bool JSSVGFEOffsetElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGFEOffsetElement, Base>(exec, &JSSVGFEOffsetElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFEOffsetElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEOffsetElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEOffsetElement* imp = static_cast<SVGFEOffsetElement*>(static_cast<JSSVGFEOffsetElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->in1Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEOffsetElementDx(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEOffsetElementDx(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEOffsetElement* imp = static_cast<SVGFEOffsetElement*>(static_cast<JSSVGFEOffsetElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->dxAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEOffsetElementDy(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEOffsetElementDy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEOffsetElement* imp = static_cast<SVGFEOffsetElement*>(static_cast<JSSVGFEOffsetElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->dyAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEOffsetElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEOffsetElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEOffsetElement* imp = static_cast<SVGFEOffsetElement*>(static_cast<JSSVGFEOffsetElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEOffsetElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEOffsetElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEOffsetElement* imp = static_cast<SVGFEOffsetElement*>(static_cast<JSSVGFEOffsetElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEOffsetElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEOffsetElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEOffsetElement* imp = static_cast<SVGFEOffsetElement*>(static_cast<JSSVGFEOffsetElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEOffsetElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEOffsetElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEOffsetElement* imp = static_cast<SVGFEOffsetElement*>(static_cast<JSSVGFEOffsetElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEOffsetElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEOffsetElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEOffsetElement* imp = static_cast<SVGFEOffsetElement*>(static_cast<JSSVGFEOffsetElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->resultAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEOffsetElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEOffsetElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEOffsetElement* imp = static_cast<SVGFEOffsetElement*>(static_cast<JSSVGFEOffsetElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEOffsetElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEOffsetElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEOffsetElement* imp = static_cast<SVGFEOffsetElement*>(static_cast<JSSVGFEOffsetElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGFEOffsetElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGFEOffsetElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFEOffsetElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFEOffsetElement::s_info)) return throwError(exec, TypeError); JSSVGFEOffsetElement* castedThisObj = static_cast<JSSVGFEOffsetElement*>(asObject(thisValue)); SVGFEOffsetElement* imp = static_cast<SVGFEOffsetElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEOffsetElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEOffsetElement.h index 32c7af696a..b708b6e39a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEOffsetElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEOffsetElement.h @@ -22,7 +22,7 @@ #define JSSVGFEOffsetElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,12 +34,12 @@ class JSSVGFEOffsetElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFEOffsetElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEOffsetElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,12 +48,13 @@ public: class JSSVGFEOffsetElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -62,22 +63,22 @@ public: // Functions -JSC::JSValuePtr jsSVGFEOffsetElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFEOffsetElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGFEOffsetElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEOffsetElementDx(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEOffsetElementDy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEOffsetElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEOffsetElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEOffsetElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEOffsetElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEOffsetElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEOffsetElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEOffsetElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEOffsetElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEOffsetElementDx(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEOffsetElementDy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEOffsetElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEOffsetElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEOffsetElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEOffsetElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEOffsetElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEOffsetElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEOffsetElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEPointLightElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEPointLightElement.cpp index b9945afe43..d4ee84a92d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEPointLightElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEPointLightElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFEPointLightElement.h" @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFEPointLightElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFEPointLightElement); /* Hash table */ @@ -71,9 +71,9 @@ static const HashTable JSSVGFEPointLightElementPrototypeTable = const ClassInfo JSSVGFEPointLightElementPrototype::s_info = { "SVGFEPointLightElementPrototype", 0, &JSSVGFEPointLightElementPrototypeTable, 0 }; -JSObject* JSSVGFEPointLightElementPrototype::self(ExecState* exec) +JSObject* JSSVGFEPointLightElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFEPointLightElement>(exec); + return getDOMPrototype<JSSVGFEPointLightElement>(exec, globalObject); } const ClassInfo JSSVGFEPointLightElement::s_info = { "SVGFEPointLightElement", &JSSVGElement::s_info, &JSSVGFEPointLightElementTable, 0 }; @@ -83,9 +83,9 @@ JSSVGFEPointLightElement::JSSVGFEPointLightElement(PassRefPtr<Structure> structu { } -JSObject* JSSVGFEPointLightElement::createPrototype(ExecState* exec) +JSObject* JSSVGFEPointLightElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFEPointLightElementPrototype(JSSVGFEPointLightElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFEPointLightElementPrototype(JSSVGFEPointLightElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFEPointLightElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -93,22 +93,25 @@ bool JSSVGFEPointLightElement::getOwnPropertySlot(ExecState* exec, const Identif return getStaticValueSlot<JSSVGFEPointLightElement, Base>(exec, &JSSVGFEPointLightElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFEPointLightElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEPointLightElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEPointLightElement* imp = static_cast<SVGFEPointLightElement*>(static_cast<JSSVGFEPointLightElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEPointLightElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEPointLightElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEPointLightElement* imp = static_cast<SVGFEPointLightElement*>(static_cast<JSSVGFEPointLightElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFEPointLightElementZ(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFEPointLightElementZ(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFEPointLightElement* imp = static_cast<SVGFEPointLightElement*>(static_cast<JSSVGFEPointLightElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->zAnimated(); return toJS(exec, obj.get(), imp); @@ -117,4 +120,4 @@ JSValuePtr jsSVGFEPointLightElementZ(ExecState* exec, const Identifier&, const P } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEPointLightElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEPointLightElement.h index b2fd6acd5d..50d628b5a0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEPointLightElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEPointLightElement.h @@ -22,7 +22,7 @@ #define JSSVGFEPointLightElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,12 +34,12 @@ class JSSVGFEPointLightElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFEPointLightElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFEPointLightElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,8 +48,9 @@ public: class JSSVGFEPointLightElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGFEPointLightElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -57,12 +58,12 @@ public: // Attributes -JSC::JSValuePtr jsSVGFEPointLightElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEPointLightElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFEPointLightElementZ(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEPointLightElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEPointLightElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFEPointLightElementZ(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFESpecularLightingElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFESpecularLightingElement.cpp index 65c50af974..a1962e5464 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFESpecularLightingElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFESpecularLightingElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFESpecularLightingElement.h" @@ -44,7 +44,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFESpecularLightingElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFESpecularLightingElement); /* Hash table */ @@ -88,9 +88,9 @@ static const HashTable JSSVGFESpecularLightingElementPrototypeTable = const ClassInfo JSSVGFESpecularLightingElementPrototype::s_info = { "SVGFESpecularLightingElementPrototype", 0, &JSSVGFESpecularLightingElementPrototypeTable, 0 }; -JSObject* JSSVGFESpecularLightingElementPrototype::self(ExecState* exec) +JSObject* JSSVGFESpecularLightingElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFESpecularLightingElement>(exec); + return getDOMPrototype<JSSVGFESpecularLightingElement>(exec, globalObject); } bool JSSVGFESpecularLightingElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -105,9 +105,9 @@ JSSVGFESpecularLightingElement::JSSVGFESpecularLightingElement(PassRefPtr<Struct { } -JSObject* JSSVGFESpecularLightingElement::createPrototype(ExecState* exec) +JSObject* JSSVGFESpecularLightingElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFESpecularLightingElementPrototype(JSSVGFESpecularLightingElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFESpecularLightingElementPrototype(JSSVGFESpecularLightingElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFESpecularLightingElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -115,96 +115,108 @@ bool JSSVGFESpecularLightingElement::getOwnPropertySlot(ExecState* exec, const I return getStaticValueSlot<JSSVGFESpecularLightingElement, Base>(exec, &JSSVGFESpecularLightingElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFESpecularLightingElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpecularLightingElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpecularLightingElement* imp = static_cast<SVGFESpecularLightingElement*>(static_cast<JSSVGFESpecularLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->in1Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpecularLightingElementSurfaceScale(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpecularLightingElementSurfaceScale(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpecularLightingElement* imp = static_cast<SVGFESpecularLightingElement*>(static_cast<JSSVGFESpecularLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->surfaceScaleAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpecularLightingElementSpecularConstant(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpecularLightingElementSpecularConstant(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpecularLightingElement* imp = static_cast<SVGFESpecularLightingElement*>(static_cast<JSSVGFESpecularLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->specularConstantAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpecularLightingElementSpecularExponent(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpecularLightingElementSpecularExponent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpecularLightingElement* imp = static_cast<SVGFESpecularLightingElement*>(static_cast<JSSVGFESpecularLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->specularExponentAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpecularLightingElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpecularLightingElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpecularLightingElement* imp = static_cast<SVGFESpecularLightingElement*>(static_cast<JSSVGFESpecularLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpecularLightingElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpecularLightingElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpecularLightingElement* imp = static_cast<SVGFESpecularLightingElement*>(static_cast<JSSVGFESpecularLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpecularLightingElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpecularLightingElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpecularLightingElement* imp = static_cast<SVGFESpecularLightingElement*>(static_cast<JSSVGFESpecularLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpecularLightingElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpecularLightingElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpecularLightingElement* imp = static_cast<SVGFESpecularLightingElement*>(static_cast<JSSVGFESpecularLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpecularLightingElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpecularLightingElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpecularLightingElement* imp = static_cast<SVGFESpecularLightingElement*>(static_cast<JSSVGFESpecularLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->resultAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpecularLightingElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpecularLightingElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpecularLightingElement* imp = static_cast<SVGFESpecularLightingElement*>(static_cast<JSSVGFESpecularLightingElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpecularLightingElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpecularLightingElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpecularLightingElement* imp = static_cast<SVGFESpecularLightingElement*>(static_cast<JSSVGFESpecularLightingElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGFESpecularLightingElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGFESpecularLightingElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFESpecularLightingElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFESpecularLightingElement::s_info)) return throwError(exec, TypeError); JSSVGFESpecularLightingElement* castedThisObj = static_cast<JSSVGFESpecularLightingElement*>(asObject(thisValue)); SVGFESpecularLightingElement* imp = static_cast<SVGFESpecularLightingElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFESpecularLightingElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFESpecularLightingElement.h index fba28319ea..0ba74f552b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFESpecularLightingElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFESpecularLightingElement.h @@ -22,7 +22,7 @@ #define JSSVGFESpecularLightingElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,12 +34,12 @@ class JSSVGFESpecularLightingElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFESpecularLightingElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFESpecularLightingElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,12 +48,13 @@ public: class JSSVGFESpecularLightingElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -62,23 +63,23 @@ public: // Functions -JSC::JSValuePtr jsSVGFESpecularLightingElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFESpecularLightingElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGFESpecularLightingElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpecularLightingElementSurfaceScale(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpecularLightingElementSpecularConstant(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpecularLightingElementSpecularExponent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpecularLightingElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpecularLightingElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpecularLightingElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpecularLightingElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpecularLightingElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpecularLightingElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpecularLightingElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpecularLightingElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpecularLightingElementSurfaceScale(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpecularLightingElementSpecularConstant(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpecularLightingElementSpecularExponent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpecularLightingElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpecularLightingElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpecularLightingElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpecularLightingElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpecularLightingElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpecularLightingElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpecularLightingElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFESpotLightElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFESpotLightElement.cpp index cf23d956a3..f8f1c77c36 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFESpotLightElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFESpotLightElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFESpotLightElement.h" @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFESpotLightElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFESpotLightElement); /* Hash table */ @@ -76,9 +76,9 @@ static const HashTable JSSVGFESpotLightElementPrototypeTable = const ClassInfo JSSVGFESpotLightElementPrototype::s_info = { "SVGFESpotLightElementPrototype", 0, &JSSVGFESpotLightElementPrototypeTable, 0 }; -JSObject* JSSVGFESpotLightElementPrototype::self(ExecState* exec) +JSObject* JSSVGFESpotLightElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFESpotLightElement>(exec); + return getDOMPrototype<JSSVGFESpotLightElement>(exec, globalObject); } const ClassInfo JSSVGFESpotLightElement::s_info = { "SVGFESpotLightElement", &JSSVGElement::s_info, &JSSVGFESpotLightElementTable, 0 }; @@ -88,9 +88,9 @@ JSSVGFESpotLightElement::JSSVGFESpotLightElement(PassRefPtr<Structure> structure { } -JSObject* JSSVGFESpotLightElement::createPrototype(ExecState* exec) +JSObject* JSSVGFESpotLightElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFESpotLightElementPrototype(JSSVGFESpotLightElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFESpotLightElementPrototype(JSSVGFESpotLightElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFESpotLightElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -98,57 +98,65 @@ bool JSSVGFESpotLightElement::getOwnPropertySlot(ExecState* exec, const Identifi return getStaticValueSlot<JSSVGFESpotLightElement, Base>(exec, &JSSVGFESpotLightElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFESpotLightElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpotLightElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpotLightElement* imp = static_cast<SVGFESpotLightElement*>(static_cast<JSSVGFESpotLightElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpotLightElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpotLightElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpotLightElement* imp = static_cast<SVGFESpotLightElement*>(static_cast<JSSVGFESpotLightElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpotLightElementZ(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpotLightElementZ(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpotLightElement* imp = static_cast<SVGFESpotLightElement*>(static_cast<JSSVGFESpotLightElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->zAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpotLightElementPointsAtX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpotLightElementPointsAtX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpotLightElement* imp = static_cast<SVGFESpotLightElement*>(static_cast<JSSVGFESpotLightElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->pointsAtXAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpotLightElementPointsAtY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpotLightElementPointsAtY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpotLightElement* imp = static_cast<SVGFESpotLightElement*>(static_cast<JSSVGFESpotLightElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->pointsAtYAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpotLightElementPointsAtZ(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpotLightElementPointsAtZ(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpotLightElement* imp = static_cast<SVGFESpotLightElement*>(static_cast<JSSVGFESpotLightElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->pointsAtZAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpotLightElementSpecularExponent(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpotLightElementSpecularExponent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpotLightElement* imp = static_cast<SVGFESpotLightElement*>(static_cast<JSSVGFESpotLightElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->specularExponentAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFESpotLightElementLimitingConeAngle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFESpotLightElementLimitingConeAngle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFESpotLightElement* imp = static_cast<SVGFESpotLightElement*>(static_cast<JSSVGFESpotLightElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->limitingConeAngleAnimated(); return toJS(exec, obj.get(), imp); @@ -157,4 +165,4 @@ JSValuePtr jsSVGFESpotLightElementLimitingConeAngle(ExecState* exec, const Ident } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFESpotLightElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFESpotLightElement.h index a4fd1c79b3..77fb6d5467 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFESpotLightElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFESpotLightElement.h @@ -22,7 +22,7 @@ #define JSSVGFESpotLightElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,12 +34,12 @@ class JSSVGFESpotLightElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFESpotLightElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFESpotLightElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,8 +48,9 @@ public: class JSSVGFESpotLightElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGFESpotLightElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -57,17 +58,17 @@ public: // Attributes -JSC::JSValuePtr jsSVGFESpotLightElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpotLightElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpotLightElementZ(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpotLightElementPointsAtX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpotLightElementPointsAtY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpotLightElementPointsAtZ(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpotLightElementSpecularExponent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFESpotLightElementLimitingConeAngle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpotLightElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpotLightElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpotLightElementZ(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpotLightElementPointsAtX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpotLightElementPointsAtY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpotLightElementPointsAtZ(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpotLightElementSpecularExponent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFESpotLightElementLimitingConeAngle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFETileElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFETileElement.cpp index 7f0c248ef9..4365666253 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFETileElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFETileElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFETileElement.h" @@ -43,7 +43,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFETileElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFETileElement); /* Hash table */ @@ -84,9 +84,9 @@ static const HashTable JSSVGFETileElementPrototypeTable = const ClassInfo JSSVGFETileElementPrototype::s_info = { "SVGFETileElementPrototype", 0, &JSSVGFETileElementPrototypeTable, 0 }; -JSObject* JSSVGFETileElementPrototype::self(ExecState* exec) +JSObject* JSSVGFETileElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFETileElement>(exec); + return getDOMPrototype<JSSVGFETileElement>(exec, globalObject); } bool JSSVGFETileElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -101,9 +101,9 @@ JSSVGFETileElement::JSSVGFETileElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSSVGFETileElement::createPrototype(ExecState* exec) +JSObject* JSSVGFETileElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFETileElementPrototype(JSSVGFETileElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFETileElementPrototype(JSSVGFETileElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFETileElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -111,75 +111,84 @@ bool JSSVGFETileElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSSVGFETileElement, Base>(exec, &JSSVGFETileElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFETileElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETileElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETileElement* imp = static_cast<SVGFETileElement*>(static_cast<JSSVGFETileElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->in1Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETileElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETileElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETileElement* imp = static_cast<SVGFETileElement*>(static_cast<JSSVGFETileElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETileElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETileElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETileElement* imp = static_cast<SVGFETileElement*>(static_cast<JSSVGFETileElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETileElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETileElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETileElement* imp = static_cast<SVGFETileElement*>(static_cast<JSSVGFETileElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETileElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETileElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETileElement* imp = static_cast<SVGFETileElement*>(static_cast<JSSVGFETileElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETileElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETileElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETileElement* imp = static_cast<SVGFETileElement*>(static_cast<JSSVGFETileElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->resultAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETileElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETileElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETileElement* imp = static_cast<SVGFETileElement*>(static_cast<JSSVGFETileElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETileElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETileElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETileElement* imp = static_cast<SVGFETileElement*>(static_cast<JSSVGFETileElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGFETileElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGFETileElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFETileElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFETileElement::s_info)) return throwError(exec, TypeError); JSSVGFETileElement* castedThisObj = static_cast<JSSVGFETileElement*>(asObject(thisValue)); SVGFETileElement* imp = static_cast<SVGFETileElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFETileElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFETileElement.h index 84d4e66dd9..892a14b275 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFETileElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFETileElement.h @@ -22,7 +22,7 @@ #define JSSVGFETileElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,12 +34,12 @@ class JSSVGFETileElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFETileElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFETileElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,12 +48,13 @@ public: class JSSVGFETileElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -62,20 +63,20 @@ public: // Functions -JSC::JSValuePtr jsSVGFETileElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFETileElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGFETileElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETileElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETileElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETileElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETileElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETileElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETileElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETileElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETileElementIn1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETileElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETileElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETileElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETileElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETileElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETileElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETileElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFETurbulenceElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFETurbulenceElement.cpp index 5a29db1f55..e643b9796f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFETurbulenceElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFETurbulenceElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFETurbulenceElement.h" @@ -47,7 +47,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFETurbulenceElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFETurbulenceElement); /* Hash table */ @@ -102,13 +102,13 @@ public: JSSVGFETurbulenceElementConstructor(ExecState* exec) : DOMObject(JSSVGFETurbulenceElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGFETurbulenceElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGFETurbulenceElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -144,9 +144,9 @@ static const HashTable JSSVGFETurbulenceElementPrototypeTable = const ClassInfo JSSVGFETurbulenceElementPrototype::s_info = { "SVGFETurbulenceElementPrototype", 0, &JSSVGFETurbulenceElementPrototypeTable, 0 }; -JSObject* JSSVGFETurbulenceElementPrototype::self(ExecState* exec) +JSObject* JSSVGFETurbulenceElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFETurbulenceElement>(exec); + return getDOMPrototype<JSSVGFETurbulenceElement>(exec, globalObject); } bool JSSVGFETurbulenceElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -161,9 +161,9 @@ JSSVGFETurbulenceElement::JSSVGFETurbulenceElement(PassRefPtr<Structure> structu { } -JSObject* JSSVGFETurbulenceElement::createPrototype(ExecState* exec) +JSObject* JSSVGFETurbulenceElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFETurbulenceElementPrototype(JSSVGFETurbulenceElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFETurbulenceElementPrototype(JSSVGFETurbulenceElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFETurbulenceElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -171,146 +171,160 @@ bool JSSVGFETurbulenceElement::getOwnPropertySlot(ExecState* exec, const Identif return getStaticValueSlot<JSSVGFETurbulenceElement, Base>(exec, &JSSVGFETurbulenceElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFETurbulenceElementBaseFrequencyX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETurbulenceElementBaseFrequencyX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETurbulenceElement* imp = static_cast<SVGFETurbulenceElement*>(static_cast<JSSVGFETurbulenceElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->baseFrequencyXAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETurbulenceElementBaseFrequencyY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETurbulenceElementBaseFrequencyY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETurbulenceElement* imp = static_cast<SVGFETurbulenceElement*>(static_cast<JSSVGFETurbulenceElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->baseFrequencyYAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETurbulenceElementNumOctaves(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETurbulenceElementNumOctaves(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETurbulenceElement* imp = static_cast<SVGFETurbulenceElement*>(static_cast<JSSVGFETurbulenceElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedInteger> obj = imp->numOctavesAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETurbulenceElementSeed(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETurbulenceElementSeed(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETurbulenceElement* imp = static_cast<SVGFETurbulenceElement*>(static_cast<JSSVGFETurbulenceElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->seedAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETurbulenceElementStitchTiles(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETurbulenceElementStitchTiles(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETurbulenceElement* imp = static_cast<SVGFETurbulenceElement*>(static_cast<JSSVGFETurbulenceElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->stitchTilesAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETurbulenceElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETurbulenceElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETurbulenceElement* imp = static_cast<SVGFETurbulenceElement*>(static_cast<JSSVGFETurbulenceElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->typeAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETurbulenceElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETurbulenceElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETurbulenceElement* imp = static_cast<SVGFETurbulenceElement*>(static_cast<JSSVGFETurbulenceElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETurbulenceElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETurbulenceElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETurbulenceElement* imp = static_cast<SVGFETurbulenceElement*>(static_cast<JSSVGFETurbulenceElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETurbulenceElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETurbulenceElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETurbulenceElement* imp = static_cast<SVGFETurbulenceElement*>(static_cast<JSSVGFETurbulenceElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETurbulenceElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETurbulenceElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETurbulenceElement* imp = static_cast<SVGFETurbulenceElement*>(static_cast<JSSVGFETurbulenceElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETurbulenceElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETurbulenceElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETurbulenceElement* imp = static_cast<SVGFETurbulenceElement*>(static_cast<JSSVGFETurbulenceElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->resultAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETurbulenceElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETurbulenceElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETurbulenceElement* imp = static_cast<SVGFETurbulenceElement*>(static_cast<JSSVGFETurbulenceElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFETurbulenceElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETurbulenceElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFETurbulenceElement* imp = static_cast<SVGFETurbulenceElement*>(static_cast<JSSVGFETurbulenceElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGFETurbulenceElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFETurbulenceElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGFETurbulenceElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSSVGFETurbulenceElement::getConstructor(ExecState* exec) +JSValue JSSVGFETurbulenceElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGFETurbulenceElementConstructor>(exec); } -JSValuePtr jsSVGFETurbulenceElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGFETurbulenceElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFETurbulenceElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFETurbulenceElement::s_info)) return throwError(exec, TypeError); JSSVGFETurbulenceElement* castedThisObj = static_cast<JSSVGFETurbulenceElement*>(asObject(thisValue)); SVGFETurbulenceElement* imp = static_cast<SVGFETurbulenceElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } // Constant getters -JSValuePtr jsSVGFETurbulenceElementSVG_TURBULENCE_TYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFETurbulenceElementSVG_TURBULENCE_TYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGFETurbulenceElementSVG_TURBULENCE_TYPE_FRACTALNOISE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFETurbulenceElementSVG_TURBULENCE_TYPE_FRACTALNOISE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGFETurbulenceElementSVG_TURBULENCE_TYPE_TURBULENCE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFETurbulenceElementSVG_TURBULENCE_TYPE_TURBULENCE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGFETurbulenceElementSVG_STITCHTYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFETurbulenceElementSVG_STITCHTYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGFETurbulenceElementSVG_STITCHTYPE_STITCH(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFETurbulenceElementSVG_STITCHTYPE_STITCH(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGFETurbulenceElementSVG_STITCHTYPE_NOSTITCH(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGFETurbulenceElementSVG_STITCHTYPE_NOSTITCH(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } @@ -318,4 +332,4 @@ JSValuePtr jsSVGFETurbulenceElementSVG_STITCHTYPE_NOSTITCH(ExecState* exec, cons } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFETurbulenceElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFETurbulenceElement.h index 6b2ff8890f..c27ba2560d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFETurbulenceElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFETurbulenceElement.h @@ -22,7 +22,7 @@ #define JSSVGFETurbulenceElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,27 +34,28 @@ class JSSVGFETurbulenceElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFETurbulenceElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFETurbulenceElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSSVGFETurbulenceElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,34 +64,34 @@ public: // Functions -JSC::JSValuePtr jsSVGFETurbulenceElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFETurbulenceElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGFETurbulenceElementBaseFrequencyX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementBaseFrequencyY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementNumOctaves(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementSeed(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementStitchTiles(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementBaseFrequencyX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementBaseFrequencyY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementNumOctaves(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementSeed(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementStitchTiles(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementResult(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGFETurbulenceElementSVG_TURBULENCE_TYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementSVG_TURBULENCE_TYPE_FRACTALNOISE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementSVG_TURBULENCE_TYPE_TURBULENCE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementSVG_STITCHTYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementSVG_STITCHTYPE_STITCH(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFETurbulenceElementSVG_STITCHTYPE_NOSTITCH(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementSVG_TURBULENCE_TYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementSVG_TURBULENCE_TYPE_FRACTALNOISE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementSVG_TURBULENCE_TYPE_TURBULENCE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementSVG_STITCHTYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementSVG_STITCHTYPE_STITCH(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFETurbulenceElementSVG_STITCHTYPE_NOSTITCH(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFilterElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFilterElement.cpp index 695589bfd5..eb83ad79b1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFilterElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFilterElement.cpp @@ -21,7 +21,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGElement.h" #include "JSSVGFilterElement.h" @@ -48,7 +48,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFilterElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFilterElement); /* Hash table */ @@ -96,9 +96,9 @@ static const HashTable JSSVGFilterElementPrototypeTable = const ClassInfo JSSVGFilterElementPrototype::s_info = { "SVGFilterElementPrototype", 0, &JSSVGFilterElementPrototypeTable, 0 }; -JSObject* JSSVGFilterElementPrototype::self(ExecState* exec) +JSObject* JSSVGFilterElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFilterElement>(exec); + return getDOMPrototype<JSSVGFilterElement>(exec, globalObject); } bool JSSVGFilterElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -113,9 +113,9 @@ JSSVGFilterElement::JSSVGFilterElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSSVGFilterElement::createPrototype(ExecState* exec) +JSObject* JSSVGFilterElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFilterElementPrototype(JSSVGFilterElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFilterElementPrototype(JSSVGFilterElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGFilterElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -123,145 +123,161 @@ bool JSSVGFilterElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSSVGFilterElement, Base>(exec, &JSSVGFilterElementTable, this, propertyName, slot); } -JSValuePtr jsSVGFilterElementFilterUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFilterElementFilterUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFilterElement* imp = static_cast<SVGFilterElement*>(static_cast<JSSVGFilterElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->filterUnitsAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFilterElementPrimitiveUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFilterElementPrimitiveUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFilterElement* imp = static_cast<SVGFilterElement*>(static_cast<JSSVGFilterElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->primitiveUnitsAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFilterElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFilterElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFilterElement* imp = static_cast<SVGFilterElement*>(static_cast<JSSVGFilterElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFilterElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFilterElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFilterElement* imp = static_cast<SVGFilterElement*>(static_cast<JSSVGFilterElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFilterElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFilterElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFilterElement* imp = static_cast<SVGFilterElement*>(static_cast<JSSVGFilterElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFilterElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFilterElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFilterElement* imp = static_cast<SVGFilterElement*>(static_cast<JSSVGFilterElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFilterElementFilterResX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFilterElementFilterResX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFilterElement* imp = static_cast<SVGFilterElement*>(static_cast<JSSVGFilterElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedInteger> obj = imp->filterResXAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFilterElementFilterResY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFilterElementFilterResY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFilterElement* imp = static_cast<SVGFilterElement*>(static_cast<JSSVGFilterElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedInteger> obj = imp->filterResYAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFilterElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFilterElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFilterElement* imp = static_cast<SVGFilterElement*>(static_cast<JSSVGFilterElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->hrefAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFilterElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFilterElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFilterElement* imp = static_cast<SVGFilterElement*>(static_cast<JSSVGFilterElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGFilterElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFilterElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFilterElement* imp = static_cast<SVGFilterElement*>(static_cast<JSSVGFilterElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGFilterElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFilterElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFilterElement* imp = static_cast<SVGFilterElement*>(static_cast<JSSVGFilterElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFilterElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFilterElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFilterElement* imp = static_cast<SVGFilterElement*>(static_cast<JSSVGFilterElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGFilterElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGFilterElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGFilterElement* imp = static_cast<SVGFilterElement*>(static_cast<JSSVGFilterElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -void JSSVGFilterElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGFilterElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGFilterElement, Base>(exec, propertyName, value, &JSSVGFilterElementTable, this, slot); } -void setJSSVGFilterElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGFilterElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGFilterElement* imp = static_cast<SVGFilterElement*>(static_cast<JSSVGFilterElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGFilterElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGFilterElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGFilterElement* imp = static_cast<SVGFilterElement*>(static_cast<JSSVGFilterElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGFilterElementPrototypeFunctionSetFilterRes(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGFilterElementPrototypeFunctionSetFilterRes(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFilterElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFilterElement::s_info)) return throwError(exec, TypeError); JSSVGFilterElement* castedThisObj = static_cast<JSSVGFilterElement*>(asObject(thisValue)); SVGFilterElement* imp = static_cast<SVGFilterElement*>(castedThisObj->impl()); - unsigned filterResX = args.at(exec, 0)->toInt32(exec); - unsigned filterResY = args.at(exec, 1)->toInt32(exec); + unsigned filterResX = args.at(0).toInt32(exec); + unsigned filterResY = args.at(1).toInt32(exec); imp->setFilterRes(filterResX, filterResY); return jsUndefined(); } -JSValuePtr jsSVGFilterElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGFilterElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGFilterElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGFilterElement::s_info)) return throwError(exec, TypeError); JSSVGFilterElement* castedThisObj = static_cast<JSSVGFilterElement*>(asObject(thisValue)); SVGFilterElement* imp = static_cast<SVGFilterElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } } -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFilterElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFilterElement.h index eb9062b076..e2294148ee 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFilterElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFilterElement.h @@ -22,7 +22,7 @@ #define JSSVGFilterElement_h -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "JSSVGElement.h" @@ -34,13 +34,13 @@ class JSSVGFilterElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFilterElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFilterElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGFilterElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,29 +64,29 @@ public: // Functions -JSC::JSValuePtr jsSVGFilterElementPrototypeFunctionSetFilterRes(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGFilterElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFilterElementPrototypeFunctionSetFilterRes(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGFilterElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGFilterElementFilterUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFilterElementPrimitiveUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFilterElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFilterElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFilterElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFilterElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFilterElementFilterResX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFilterElementFilterResY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFilterElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFilterElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGFilterElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGFilterElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGFilterElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGFilterElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFilterElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGFilterElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFilterElementFilterUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFilterElementPrimitiveUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFilterElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFilterElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFilterElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFilterElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFilterElementFilterResX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFilterElementFilterResY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFilterElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFilterElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGFilterElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGFilterElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGFilterElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGFilterElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFilterElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGFilterElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore -#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS) +#endif // ENABLE(SVG) && ENABLE(FILTERS) #endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFontElement.cpp index 940231424e..2b2022f37a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFontElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFontElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGFontElementPrototypeTable = const ClassInfo JSSVGFontElementPrototype::s_info = { "SVGFontElementPrototype", 0, &JSSVGFontElementPrototypeTable, 0 }; -JSObject* JSSVGFontElementPrototype::self(ExecState* exec) +JSObject* JSSVGFontElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFontElement>(exec); + return getDOMPrototype<JSSVGFontElement>(exec, globalObject); } const ClassInfo JSSVGFontElement::s_info = { "SVGFontElement", &JSSVGElement::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGFontElement::JSSVGFontElement(PassRefPtr<Structure> structure, PassRefPtr<S { } -JSObject* JSSVGFontElement::createPrototype(ExecState* exec) +JSObject* JSSVGFontElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFontElementPrototype(JSSVGFontElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFontElementPrototype(JSSVGFontElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFontElement.h index 689377f4e0..8492a8e1f1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontElement.h @@ -34,7 +34,7 @@ class JSSVGFontElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFontElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFontElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGFontElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGFontElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceElement.cpp index 87a012fe1a..18a1542416 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFontFaceElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFontFaceElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGFontFaceElementPrototypeTable = const ClassInfo JSSVGFontFaceElementPrototype::s_info = { "SVGFontFaceElementPrototype", 0, &JSSVGFontFaceElementPrototypeTable, 0 }; -JSObject* JSSVGFontFaceElementPrototype::self(ExecState* exec) +JSObject* JSSVGFontFaceElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFontFaceElement>(exec); + return getDOMPrototype<JSSVGFontFaceElement>(exec, globalObject); } const ClassInfo JSSVGFontFaceElement::s_info = { "SVGFontFaceElement", &JSSVGElement::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGFontFaceElement::JSSVGFontFaceElement(PassRefPtr<Structure> structure, Pass { } -JSObject* JSSVGFontFaceElement::createPrototype(ExecState* exec) +JSObject* JSSVGFontFaceElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFontFaceElementPrototype(JSSVGFontFaceElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFontFaceElementPrototype(JSSVGFontFaceElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceElement.h index 538ea5fd8d..5977f1bab8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceElement.h @@ -34,7 +34,7 @@ class JSSVGFontFaceElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFontFaceElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFontFaceElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGFontFaceElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGFontFaceElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceFormatElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceFormatElement.cpp index afac6a92db..23496625e4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceFormatElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceFormatElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFontFaceFormatElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFontFaceFormatElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGFontFaceFormatElementPrototypeTable = const ClassInfo JSSVGFontFaceFormatElementPrototype::s_info = { "SVGFontFaceFormatElementPrototype", 0, &JSSVGFontFaceFormatElementPrototypeTable, 0 }; -JSObject* JSSVGFontFaceFormatElementPrototype::self(ExecState* exec) +JSObject* JSSVGFontFaceFormatElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFontFaceFormatElement>(exec); + return getDOMPrototype<JSSVGFontFaceFormatElement>(exec, globalObject); } const ClassInfo JSSVGFontFaceFormatElement::s_info = { "SVGFontFaceFormatElement", &JSSVGElement::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGFontFaceFormatElement::JSSVGFontFaceFormatElement(PassRefPtr<Structure> str { } -JSObject* JSSVGFontFaceFormatElement::createPrototype(ExecState* exec) +JSObject* JSSVGFontFaceFormatElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFontFaceFormatElementPrototype(JSSVGFontFaceFormatElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFontFaceFormatElementPrototype(JSSVGFontFaceFormatElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceFormatElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceFormatElement.h index b1d6eb7763..3bf9acfbe6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceFormatElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceFormatElement.h @@ -34,7 +34,7 @@ class JSSVGFontFaceFormatElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFontFaceFormatElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFontFaceFormatElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGFontFaceFormatElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGFontFaceFormatElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceNameElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceNameElement.cpp index 3fe3a474b0..190c7fb57b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceNameElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceNameElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFontFaceNameElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFontFaceNameElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGFontFaceNameElementPrototypeTable = const ClassInfo JSSVGFontFaceNameElementPrototype::s_info = { "SVGFontFaceNameElementPrototype", 0, &JSSVGFontFaceNameElementPrototypeTable, 0 }; -JSObject* JSSVGFontFaceNameElementPrototype::self(ExecState* exec) +JSObject* JSSVGFontFaceNameElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFontFaceNameElement>(exec); + return getDOMPrototype<JSSVGFontFaceNameElement>(exec, globalObject); } const ClassInfo JSSVGFontFaceNameElement::s_info = { "SVGFontFaceNameElement", &JSSVGElement::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGFontFaceNameElement::JSSVGFontFaceNameElement(PassRefPtr<Structure> structu { } -JSObject* JSSVGFontFaceNameElement::createPrototype(ExecState* exec) +JSObject* JSSVGFontFaceNameElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFontFaceNameElementPrototype(JSSVGFontFaceNameElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFontFaceNameElementPrototype(JSSVGFontFaceNameElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceNameElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceNameElement.h index 6a99c74685..a4ee587626 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceNameElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceNameElement.h @@ -34,7 +34,7 @@ class JSSVGFontFaceNameElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFontFaceNameElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFontFaceNameElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGFontFaceNameElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGFontFaceNameElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceSrcElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceSrcElement.cpp index 1830d4bd0e..ddbcf97b64 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceSrcElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceSrcElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFontFaceSrcElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFontFaceSrcElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGFontFaceSrcElementPrototypeTable = const ClassInfo JSSVGFontFaceSrcElementPrototype::s_info = { "SVGFontFaceSrcElementPrototype", 0, &JSSVGFontFaceSrcElementPrototypeTable, 0 }; -JSObject* JSSVGFontFaceSrcElementPrototype::self(ExecState* exec) +JSObject* JSSVGFontFaceSrcElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFontFaceSrcElement>(exec); + return getDOMPrototype<JSSVGFontFaceSrcElement>(exec, globalObject); } const ClassInfo JSSVGFontFaceSrcElement::s_info = { "SVGFontFaceSrcElement", &JSSVGElement::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGFontFaceSrcElement::JSSVGFontFaceSrcElement(PassRefPtr<Structure> structure { } -JSObject* JSSVGFontFaceSrcElement::createPrototype(ExecState* exec) +JSObject* JSSVGFontFaceSrcElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFontFaceSrcElementPrototype(JSSVGFontFaceSrcElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFontFaceSrcElementPrototype(JSSVGFontFaceSrcElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceSrcElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceSrcElement.h index 4e5c94e50d..cd1c129dc3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceSrcElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceSrcElement.h @@ -34,7 +34,7 @@ class JSSVGFontFaceSrcElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFontFaceSrcElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFontFaceSrcElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGFontFaceSrcElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGFontFaceSrcElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceUriElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceUriElement.cpp index 7490501a21..e055e8b8b9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceUriElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceUriElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGFontFaceUriElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGFontFaceUriElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGFontFaceUriElementPrototypeTable = const ClassInfo JSSVGFontFaceUriElementPrototype::s_info = { "SVGFontFaceUriElementPrototype", 0, &JSSVGFontFaceUriElementPrototypeTable, 0 }; -JSObject* JSSVGFontFaceUriElementPrototype::self(ExecState* exec) +JSObject* JSSVGFontFaceUriElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGFontFaceUriElement>(exec); + return getDOMPrototype<JSSVGFontFaceUriElement>(exec, globalObject); } const ClassInfo JSSVGFontFaceUriElement::s_info = { "SVGFontFaceUriElement", &JSSVGElement::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGFontFaceUriElement::JSSVGFontFaceUriElement(PassRefPtr<Structure> structure { } -JSObject* JSSVGFontFaceUriElement::createPrototype(ExecState* exec) +JSObject* JSSVGFontFaceUriElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGFontFaceUriElementPrototype(JSSVGFontFaceUriElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGFontFaceUriElementPrototype(JSSVGFontFaceUriElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceUriElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceUriElement.h index e402e31877..a62b102792 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceUriElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceUriElement.h @@ -34,7 +34,7 @@ class JSSVGFontFaceUriElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGFontFaceUriElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGFontFaceUriElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGFontFaceUriElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGFontFaceUriElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGForeignObjectElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGForeignObjectElement.cpp index 3e123d1922..7ce02aedec 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGForeignObjectElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGForeignObjectElement.cpp @@ -53,7 +53,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGForeignObjectElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGForeignObjectElement); /* Hash table */ @@ -106,9 +106,9 @@ static const HashTable JSSVGForeignObjectElementPrototypeTable = const ClassInfo JSSVGForeignObjectElementPrototype::s_info = { "SVGForeignObjectElementPrototype", 0, &JSSVGForeignObjectElementPrototypeTable, 0 }; -JSObject* JSSVGForeignObjectElementPrototype::self(ExecState* exec) +JSObject* JSSVGForeignObjectElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGForeignObjectElement>(exec); + return getDOMPrototype<JSSVGForeignObjectElement>(exec, globalObject); } bool JSSVGForeignObjectElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -123,9 +123,9 @@ JSSVGForeignObjectElement::JSSVGForeignObjectElement(PassRefPtr<Structure> struc { } -JSObject* JSSVGForeignObjectElement::createPrototype(ExecState* exec) +JSObject* JSSVGForeignObjectElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGForeignObjectElementPrototype(JSSVGForeignObjectElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGForeignObjectElementPrototype(JSSVGForeignObjectElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGForeignObjectElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -133,193 +133,214 @@ bool JSSVGForeignObjectElement::getOwnPropertySlot(ExecState* exec, const Identi return getStaticValueSlot<JSSVGForeignObjectElement, Base>(exec, &JSSVGForeignObjectElementTable, this, propertyName, slot); } -JSValuePtr jsSVGForeignObjectElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGForeignObjectElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGForeignObjectElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGForeignObjectElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGForeignObjectElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGForeignObjectElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGForeignObjectElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGForeignObjectElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGForeignObjectElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGForeignObjectElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGForeignObjectElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGForeignObjectElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGForeignObjectElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGForeignObjectElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGForeignObjectElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGForeignObjectElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGForeignObjectElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGForeignObjectElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGForeignObjectElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGForeignObjectElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGForeignObjectElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGForeignObjectElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGForeignObjectElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGForeignObjectElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGForeignObjectElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGForeignObjectElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->transformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGForeignObjectElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGForeignObjectElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGForeignObjectElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGForeignObjectElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -void JSSVGForeignObjectElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGForeignObjectElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGForeignObjectElement, Base>(exec, propertyName, value, &JSSVGForeignObjectElementTable, this, slot); } -void setJSSVGForeignObjectElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGForeignObjectElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGForeignObjectElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGForeignObjectElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(static_cast<JSSVGForeignObjectElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGForeignObjectElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGForeignObjectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGForeignObjectElement::s_info)) return throwError(exec, TypeError); JSSVGForeignObjectElement* castedThisObj = static_cast<JSSVGForeignObjectElement*>(asObject(thisValue)); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGForeignObjectElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGForeignObjectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGForeignObjectElement::s_info)) return throwError(exec, TypeError); JSSVGForeignObjectElement* castedThisObj = static_cast<JSSVGForeignObjectElement*>(asObject(thisValue)); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } -JSValuePtr jsSVGForeignObjectElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGForeignObjectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGForeignObjectElement::s_info)) return throwError(exec, TypeError); JSSVGForeignObjectElement* castedThisObj = static_cast<JSSVGForeignObjectElement*>(asObject(thisValue)); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGForeignObjectElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGForeignObjectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGForeignObjectElement::s_info)) return throwError(exec, TypeError); JSSVGForeignObjectElement* castedThisObj = static_cast<JSSVGForeignObjectElement*>(asObject(thisValue)); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGForeignObjectElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGForeignObjectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGForeignObjectElement::s_info)) return throwError(exec, TypeError); JSSVGForeignObjectElement* castedThisObj = static_cast<JSSVGForeignObjectElement*>(asObject(thisValue)); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGForeignObjectElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGForeignObjectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGForeignObjectElement::s_info)) return throwError(exec, TypeError); JSSVGForeignObjectElement* castedThisObj = static_cast<JSSVGForeignObjectElement*>(asObject(thisValue)); SVGForeignObjectElement* imp = static_cast<SVGForeignObjectElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGForeignObjectElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGForeignObjectElement.h index ebae7d6fba..a8a9e90d1d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGForeignObjectElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGForeignObjectElement.h @@ -34,13 +34,13 @@ class JSSVGForeignObjectElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGForeignObjectElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGForeignObjectElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGForeignObjectElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,31 +64,31 @@ public: // Functions -JSC::JSValuePtr jsSVGForeignObjectElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGForeignObjectElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGForeignObjectElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGForeignObjectElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGForeignObjectElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGForeignObjectElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGForeignObjectElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGForeignObjectElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGForeignObjectElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGForeignObjectElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGForeignObjectElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGForeignObjectElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGForeignObjectElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGForeignObjectElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGForeignObjectElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGForeignObjectElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGForeignObjectElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGForeignObjectElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGForeignObjectElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGForeignObjectElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGForeignObjectElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGForeignObjectElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGForeignObjectElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGForeignObjectElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGForeignObjectElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGForeignObjectElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGForeignObjectElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGForeignObjectElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGForeignObjectElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGForeignObjectElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGForeignObjectElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGForeignObjectElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGForeignObjectElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGForeignObjectElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGForeignObjectElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGForeignObjectElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGForeignObjectElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGForeignObjectElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGForeignObjectElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGForeignObjectElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGGElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGGElement.cpp index 307765bc02..8c40d8ee83 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGGElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGGElement.cpp @@ -52,7 +52,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGGElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGGElement); /* Hash table */ @@ -101,9 +101,9 @@ static const HashTable JSSVGGElementPrototypeTable = const ClassInfo JSSVGGElementPrototype::s_info = { "SVGGElementPrototype", 0, &JSSVGGElementPrototypeTable, 0 }; -JSObject* JSSVGGElementPrototype::self(ExecState* exec) +JSObject* JSSVGGElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGGElement>(exec); + return getDOMPrototype<JSSVGGElement>(exec, globalObject); } bool JSSVGGElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -118,9 +118,9 @@ JSSVGGElement::JSSVGGElement(PassRefPtr<Structure> structure, PassRefPtr<SVGGEle { } -JSObject* JSSVGGElement::createPrototype(ExecState* exec) +JSObject* JSSVGGElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGGElementPrototype(JSSVGGElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGGElementPrototype(JSSVGGElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGGElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,165 +128,182 @@ bool JSSVGGElement::getOwnPropertySlot(ExecState* exec, const Identifier& proper return getStaticValueSlot<JSSVGGElement, Base>(exec, &JSSVGGElementTable, this, propertyName, slot); } -JSValuePtr jsSVGGElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGElement* imp = static_cast<SVGGElement*>(static_cast<JSSVGGElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGGElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGElement* imp = static_cast<SVGGElement*>(static_cast<JSSVGGElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGGElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGElement* imp = static_cast<SVGGElement*>(static_cast<JSSVGGElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGGElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGElement* imp = static_cast<SVGGElement*>(static_cast<JSSVGGElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGGElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGElement* imp = static_cast<SVGGElement*>(static_cast<JSSVGGElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGGElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGElement* imp = static_cast<SVGGElement*>(static_cast<JSSVGGElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGGElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGElement* imp = static_cast<SVGGElement*>(static_cast<JSSVGGElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGGElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGElement* imp = static_cast<SVGGElement*>(static_cast<JSSVGGElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGGElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGElement* imp = static_cast<SVGGElement*>(static_cast<JSSVGGElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->transformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGGElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGElement* imp = static_cast<SVGGElement*>(static_cast<JSSVGGElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGGElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGElement* imp = static_cast<SVGGElement*>(static_cast<JSSVGGElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -void JSSVGGElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGGElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGGElement, Base>(exec, propertyName, value, &JSSVGGElementTable, this, slot); } -void setJSSVGGElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGGElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGGElement* imp = static_cast<SVGGElement*>(static_cast<JSSVGGElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGGElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGGElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGGElement* imp = static_cast<SVGGElement*>(static_cast<JSSVGGElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGGElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGGElement::s_info)) return throwError(exec, TypeError); JSSVGGElement* castedThisObj = static_cast<JSSVGGElement*>(asObject(thisValue)); SVGGElement* imp = static_cast<SVGGElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGGElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGGElement::s_info)) return throwError(exec, TypeError); JSSVGGElement* castedThisObj = static_cast<JSSVGGElement*>(asObject(thisValue)); SVGGElement* imp = static_cast<SVGGElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } -JSValuePtr jsSVGGElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGGElement::s_info)) return throwError(exec, TypeError); JSSVGGElement* castedThisObj = static_cast<JSSVGGElement*>(asObject(thisValue)); SVGGElement* imp = static_cast<SVGGElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGGElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGGElement::s_info)) return throwError(exec, TypeError); JSSVGGElement* castedThisObj = static_cast<JSSVGGElement*>(asObject(thisValue)); SVGGElement* imp = static_cast<SVGGElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGGElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGGElement::s_info)) return throwError(exec, TypeError); JSSVGGElement* castedThisObj = static_cast<JSSVGGElement*>(asObject(thisValue)); SVGGElement* imp = static_cast<SVGGElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGGElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGGElement::s_info)) return throwError(exec, TypeError); JSSVGGElement* castedThisObj = static_cast<JSSVGGElement*>(asObject(thisValue)); SVGGElement* imp = static_cast<SVGGElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGGElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGGElement.h index 183cb48cbc..72d6683069 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGGElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGGElement.h @@ -34,13 +34,13 @@ class JSSVGGElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGGElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGGElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGGElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,27 +64,27 @@ public: // Functions -JSC::JSValuePtr jsSVGGElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGGElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGGElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGGElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGGElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGGElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGGElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGGElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGGElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGGElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGGElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGGElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGGElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGGElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGGElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGGlyphElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGGlyphElement.cpp index 0a33be9e04..5e59db979b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGGlyphElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGGlyphElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGGlyphElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGGlyphElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGGlyphElementPrototypeTable = const ClassInfo JSSVGGlyphElementPrototype::s_info = { "SVGGlyphElementPrototype", 0, &JSSVGGlyphElementPrototypeTable, 0 }; -JSObject* JSSVGGlyphElementPrototype::self(ExecState* exec) +JSObject* JSSVGGlyphElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGGlyphElement>(exec); + return getDOMPrototype<JSSVGGlyphElement>(exec, globalObject); } const ClassInfo JSSVGGlyphElement::s_info = { "SVGGlyphElement", &JSSVGElement::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGGlyphElement::JSSVGGlyphElement(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSSVGGlyphElement::createPrototype(ExecState* exec) +JSObject* JSSVGGlyphElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGGlyphElementPrototype(JSSVGGlyphElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGGlyphElementPrototype(JSSVGGlyphElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGGlyphElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGGlyphElement.h index 596bd2081b..2cbea69909 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGGlyphElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGGlyphElement.h @@ -34,7 +34,7 @@ class JSSVGGlyphElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGGlyphElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGGlyphElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGGlyphElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGGlyphElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGGradientElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGGradientElement.cpp index 30b55ceb81..90352e7cf3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGGradientElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGGradientElement.cpp @@ -46,7 +46,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGGradientElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGGradientElement); /* Hash table */ @@ -93,13 +93,13 @@ public: JSSVGGradientElementConstructor(ExecState* exec) : DOMObject(JSSVGGradientElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGGradientElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGGradientElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -133,9 +133,9 @@ static const HashTable JSSVGGradientElementPrototypeTable = const ClassInfo JSSVGGradientElementPrototype::s_info = { "SVGGradientElementPrototype", 0, &JSSVGGradientElementPrototypeTable, 0 }; -JSObject* JSSVGGradientElementPrototype::self(ExecState* exec) +JSObject* JSSVGGradientElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGGradientElement>(exec); + return getDOMPrototype<JSSVGGradientElement>(exec, globalObject); } bool JSSVGGradientElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -150,9 +150,9 @@ JSSVGGradientElement::JSSVGGradientElement(PassRefPtr<Structure> structure, Pass { } -JSObject* JSSVGGradientElement::createPrototype(ExecState* exec) +JSObject* JSSVGGradientElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGGradientElementPrototype(JSSVGGradientElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGGradientElementPrototype(JSSVGGradientElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGGradientElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -160,94 +160,102 @@ bool JSSVGGradientElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGGradientElement, Base>(exec, &JSSVGGradientElementTable, this, propertyName, slot); } -JSValuePtr jsSVGGradientElementGradientUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGradientElementGradientUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGradientElement* imp = static_cast<SVGGradientElement*>(static_cast<JSSVGGradientElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->gradientUnitsAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGGradientElementGradientTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGradientElementGradientTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGradientElement* imp = static_cast<SVGGradientElement*>(static_cast<JSSVGGradientElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->gradientTransformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGGradientElementSpreadMethod(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGradientElementSpreadMethod(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGradientElement* imp = static_cast<SVGGradientElement*>(static_cast<JSSVGGradientElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->spreadMethodAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGGradientElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGradientElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGradientElement* imp = static_cast<SVGGradientElement*>(static_cast<JSSVGGradientElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->hrefAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGGradientElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGradientElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGradientElement* imp = static_cast<SVGGradientElement*>(static_cast<JSSVGGradientElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGGradientElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGradientElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGradientElement* imp = static_cast<SVGGradientElement*>(static_cast<JSSVGGradientElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGGradientElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGradientElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGGradientElement* imp = static_cast<SVGGradientElement*>(static_cast<JSSVGGradientElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGGradientElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGGradientElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGGradientElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSSVGGradientElement::getConstructor(ExecState* exec) +JSValue JSSVGGradientElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGGradientElementConstructor>(exec); } -JSValuePtr jsSVGGradientElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGGradientElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGGradientElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGGradientElement::s_info)) return throwError(exec, TypeError); JSSVGGradientElement* castedThisObj = static_cast<JSSVGGradientElement*>(asObject(thisValue)); SVGGradientElement* imp = static_cast<SVGGradientElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } // Constant getters -JSValuePtr jsSVGGradientElementSVG_SPREADMETHOD_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGGradientElementSVG_SPREADMETHOD_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGGradientElementSVG_SPREADMETHOD_PAD(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGGradientElementSVG_SPREADMETHOD_PAD(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGGradientElementSVG_SPREADMETHOD_REFLECT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGGradientElementSVG_SPREADMETHOD_REFLECT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGGradientElementSVG_SPREADMETHOD_REPEAT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGGradientElementSVG_SPREADMETHOD_REPEAT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGGradientElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGGradientElement.h index 728c2576f0..e207fb701e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGGradientElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGGradientElement.h @@ -34,27 +34,28 @@ class JSSVGGradientElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGGradientElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGGradientElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSSVGGradientElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,23 +64,23 @@ public: // Functions -JSC::JSValuePtr jsSVGGradientElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGGradientElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGGradientElementGradientUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGradientElementGradientTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGradientElementSpreadMethod(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGradientElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGradientElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGradientElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGradientElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGradientElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGradientElementGradientUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGradientElementGradientTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGradientElementSpreadMethod(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGradientElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGradientElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGradientElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGradientElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGradientElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGGradientElementSVG_SPREADMETHOD_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGradientElementSVG_SPREADMETHOD_PAD(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGradientElementSVG_SPREADMETHOD_REFLECT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGGradientElementSVG_SPREADMETHOD_REPEAT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGradientElementSVG_SPREADMETHOD_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGradientElementSVG_SPREADMETHOD_PAD(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGradientElementSVG_SPREADMETHOD_REFLECT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGGradientElementSVG_SPREADMETHOD_REPEAT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGHKernElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGHKernElement.cpp index d555c22a6e..0a6c63f288 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGHKernElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGHKernElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGHKernElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGHKernElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGHKernElementPrototypeTable = const ClassInfo JSSVGHKernElementPrototype::s_info = { "SVGHKernElementPrototype", 0, &JSSVGHKernElementPrototypeTable, 0 }; -JSObject* JSSVGHKernElementPrototype::self(ExecState* exec) +JSObject* JSSVGHKernElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGHKernElement>(exec); + return getDOMPrototype<JSSVGHKernElement>(exec, globalObject); } const ClassInfo JSSVGHKernElement::s_info = { "SVGHKernElement", &JSSVGElement::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGHKernElement::JSSVGHKernElement(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSSVGHKernElement::createPrototype(ExecState* exec) +JSObject* JSSVGHKernElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGHKernElementPrototype(JSSVGHKernElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGHKernElementPrototype(JSSVGHKernElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGHKernElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGHKernElement.h index a8bde93e0e..250aa7e95b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGHKernElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGHKernElement.h @@ -34,7 +34,7 @@ class JSSVGHKernElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGHKernElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGHKernElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGHKernElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGHKernElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGImageElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGImageElement.cpp index 74c2ebd21f..179cbfad20 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGImageElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGImageElement.cpp @@ -54,7 +54,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGImageElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGImageElement); /* Hash table */ @@ -109,9 +109,9 @@ static const HashTable JSSVGImageElementPrototypeTable = const ClassInfo JSSVGImageElementPrototype::s_info = { "SVGImageElementPrototype", 0, &JSSVGImageElementPrototypeTable, 0 }; -JSObject* JSSVGImageElementPrototype::self(ExecState* exec) +JSObject* JSSVGImageElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGImageElement>(exec); + return getDOMPrototype<JSSVGImageElement>(exec, globalObject); } bool JSSVGImageElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -126,9 +126,9 @@ JSSVGImageElement::JSSVGImageElement(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSSVGImageElement::createPrototype(ExecState* exec) +JSObject* JSSVGImageElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGImageElementPrototype(JSSVGImageElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGImageElementPrototype(JSSVGImageElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGImageElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -136,207 +136,230 @@ bool JSSVGImageElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSSVGImageElement, Base>(exec, &JSSVGImageElementTable, this, propertyName, slot); } -JSValuePtr jsSVGImageElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGImageElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGImageElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGImageElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGImageElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedPreserveAspectRatio> obj = imp->preserveAspectRatioAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGImageElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->hrefAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGImageElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGImageElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGImageElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGImageElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGImageElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGImageElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGImageElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGImageElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGImageElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->transformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGImageElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGImageElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGImageElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -void JSSVGImageElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGImageElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGImageElement, Base>(exec, propertyName, value, &JSSVGImageElementTable, this, slot); } -void setJSSVGImageElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGImageElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGImageElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGImageElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGImageElement* imp = static_cast<SVGImageElement*>(static_cast<JSSVGImageElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGImageElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGImageElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGImageElement::s_info)) return throwError(exec, TypeError); JSSVGImageElement* castedThisObj = static_cast<JSSVGImageElement*>(asObject(thisValue)); SVGImageElement* imp = static_cast<SVGImageElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGImageElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGImageElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGImageElement::s_info)) return throwError(exec, TypeError); JSSVGImageElement* castedThisObj = static_cast<JSSVGImageElement*>(asObject(thisValue)); SVGImageElement* imp = static_cast<SVGImageElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } -JSValuePtr jsSVGImageElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGImageElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGImageElement::s_info)) return throwError(exec, TypeError); JSSVGImageElement* castedThisObj = static_cast<JSSVGImageElement*>(asObject(thisValue)); SVGImageElement* imp = static_cast<SVGImageElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGImageElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGImageElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGImageElement::s_info)) return throwError(exec, TypeError); JSSVGImageElement* castedThisObj = static_cast<JSSVGImageElement*>(asObject(thisValue)); SVGImageElement* imp = static_cast<SVGImageElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGImageElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGImageElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGImageElement::s_info)) return throwError(exec, TypeError); JSSVGImageElement* castedThisObj = static_cast<JSSVGImageElement*>(asObject(thisValue)); SVGImageElement* imp = static_cast<SVGImageElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGImageElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGImageElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGImageElement::s_info)) return throwError(exec, TypeError); JSSVGImageElement* castedThisObj = static_cast<JSSVGImageElement*>(asObject(thisValue)); SVGImageElement* imp = static_cast<SVGImageElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGImageElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGImageElement.h index 9600ac155d..6479f74cc8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGImageElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGImageElement.h @@ -34,13 +34,13 @@ class JSSVGImageElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGImageElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGImageElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGImageElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,33 +64,33 @@ public: // Functions -JSC::JSValuePtr jsSVGImageElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGImageElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGImageElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGImageElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGImageElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGImageElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGImageElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGImageElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGImageElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGImageElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGImageElementPreserveAspectRatio(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGImageElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGImageElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGImageElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGImageElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGImageElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGImageElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGImageElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGImageElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGImageElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGImageElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGImageElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGImageElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGImageElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGImageElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGImageElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGImageElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGImageElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGImageElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGImageElementPreserveAspectRatio(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGImageElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGImageElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGImageElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGImageElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGImageElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGImageElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGImageElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGImageElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGImageElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGImageElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGImageElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGImageElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGImageElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGImageElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGLength.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGLength.cpp index 2c494b094f..8bb4fd2897 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGLength.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGLength.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGLength) +ASSERT_CLASS_FITS_IN_CELL(JSSVGLength); /* Hash table */ @@ -90,13 +90,13 @@ public: JSSVGLengthConstructor(ExecState* exec) : DOMObject(JSSVGLengthConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGLengthPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGLengthPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -138,9 +138,9 @@ static const HashTable JSSVGLengthPrototypeTable = const ClassInfo JSSVGLengthPrototype::s_info = { "SVGLengthPrototype", 0, &JSSVGLengthPrototypeTable, 0 }; -JSObject* JSSVGLengthPrototype::self(ExecState* exec) +JSObject* JSSVGLengthPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGLength>(exec); + return getDOMPrototype<JSSVGLength>(exec, globalObject); } bool JSSVGLengthPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -161,12 +161,11 @@ JSSVGLength::~JSSVGLength() { JSSVGDynamicPODTypeWrapperCache<SVGLength, SVGAnimatedLength>::forgetWrapper(m_impl.get()); forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGLength::createPrototype(ExecState* exec) +JSObject* JSSVGLength::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGLengthPrototype(JSSVGLengthPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGLengthPrototype(JSSVGLengthPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGLength::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -174,82 +173,87 @@ bool JSSVGLength::getOwnPropertySlot(ExecState* exec, const Identifier& property return getStaticValueSlot<JSSVGLength, Base>(exec, &JSSVGLengthTable, this, propertyName, slot); } -JSValuePtr jsSVGLengthUnitType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLengthUnitType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLength imp(*static_cast<JSSVGLength*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp.unitType()); } -JSValuePtr jsSVGLengthValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLengthValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGLength*>(asObject(slot.slotBase()))->value(exec); } -JSValuePtr jsSVGLengthValueInSpecifiedUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLengthValueInSpecifiedUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLength imp(*static_cast<JSSVGLength*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp.valueInSpecifiedUnits()); } -JSValuePtr jsSVGLengthValueAsString(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLengthValueAsString(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLength imp(*static_cast<JSSVGLength*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp.valueAsString()); } -JSValuePtr jsSVGLengthConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLengthConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGLength*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSSVGLength::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGLength::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGLength, Base>(exec, propertyName, value, &JSSVGLengthTable, this, slot); } -void setJSSVGLengthValue(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGLengthValue(ExecState* exec, JSObject* thisObject, JSValue value) { SVGLength imp(*static_cast<JSSVGLength*>(thisObject)->impl()); - imp.setValue(value->toFloat(exec)); + imp.setValue(value.toFloat(exec)); static_cast<JSSVGLength*>(thisObject)->impl()->commitChange(imp, static_cast<JSSVGLength*>(thisObject)->context()); } -void setJSSVGLengthValueInSpecifiedUnits(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGLengthValueInSpecifiedUnits(ExecState* exec, JSObject* thisObject, JSValue value) { SVGLength imp(*static_cast<JSSVGLength*>(thisObject)->impl()); - imp.setValueInSpecifiedUnits(value->toFloat(exec)); + imp.setValueInSpecifiedUnits(value.toFloat(exec)); static_cast<JSSVGLength*>(thisObject)->impl()->commitChange(imp, static_cast<JSSVGLength*>(thisObject)->context()); } -void setJSSVGLengthValueAsString(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGLengthValueAsString(ExecState* exec, JSObject* thisObject, JSValue value) { SVGLength imp(*static_cast<JSSVGLength*>(thisObject)->impl()); imp.setValueAsString(valueToStringWithNullCheck(exec, value)); static_cast<JSSVGLength*>(thisObject)->impl()->commitChange(imp, static_cast<JSSVGLength*>(thisObject)->context()); } -JSValuePtr JSSVGLength::getConstructor(ExecState* exec) +JSValue JSSVGLength::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGLengthConstructor>(exec); } -JSValuePtr jsSVGLengthPrototypeFunctionNewValueSpecifiedUnits(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGLengthPrototypeFunctionNewValueSpecifiedUnits(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGLength::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGLength::s_info)) return throwError(exec, TypeError); JSSVGLength* castedThisObj = static_cast<JSSVGLength*>(asObject(thisValue)); JSSVGPODTypeWrapper<SVGLength>* wrapper = castedThisObj->impl(); SVGLength imp(*wrapper); - unsigned short unitType = args.at(exec, 0)->toInt32(exec); - float valueInSpecifiedUnits = args.at(exec, 1)->toFloat(exec); + unsigned short unitType = args.at(0).toInt32(exec); + float valueInSpecifiedUnits = args.at(1).toFloat(exec); imp.newValueSpecifiedUnits(unitType, valueInSpecifiedUnits); wrapper->commitChange(imp, castedThisObj->context()); return jsUndefined(); } -JSValuePtr jsSVGLengthPrototypeFunctionConvertToSpecifiedUnits(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGLengthPrototypeFunctionConvertToSpecifiedUnits(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGLength::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGLength::s_info)) return throwError(exec, TypeError); JSSVGLength* castedThisObj = static_cast<JSSVGLength*>(asObject(thisValue)); return castedThisObj->convertToSpecifiedUnits(exec, args); @@ -257,68 +261,68 @@ JSValuePtr jsSVGLengthPrototypeFunctionConvertToSpecifiedUnits(ExecState* exec, // Constant getters -JSValuePtr jsSVGLengthSVG_LENGTHTYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGLengthSVG_LENGTHTYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGLengthSVG_LENGTHTYPE_NUMBER(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGLengthSVG_LENGTHTYPE_NUMBER(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGLengthSVG_LENGTHTYPE_PERCENTAGE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGLengthSVG_LENGTHTYPE_PERCENTAGE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGLengthSVG_LENGTHTYPE_EMS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGLengthSVG_LENGTHTYPE_EMS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsSVGLengthSVG_LENGTHTYPE_EXS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGLengthSVG_LENGTHTYPE_EXS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSValuePtr jsSVGLengthSVG_LENGTHTYPE_PX(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGLengthSVG_LENGTHTYPE_PX(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(5)); } -JSValuePtr jsSVGLengthSVG_LENGTHTYPE_CM(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGLengthSVG_LENGTHTYPE_CM(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(6)); } -JSValuePtr jsSVGLengthSVG_LENGTHTYPE_MM(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGLengthSVG_LENGTHTYPE_MM(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(7)); } -JSValuePtr jsSVGLengthSVG_LENGTHTYPE_IN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGLengthSVG_LENGTHTYPE_IN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(8)); } -JSValuePtr jsSVGLengthSVG_LENGTHTYPE_PT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGLengthSVG_LENGTHTYPE_PT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(9)); } -JSValuePtr jsSVGLengthSVG_LENGTHTYPE_PC(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGLengthSVG_LENGTHTYPE_PC(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(10)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper<SVGLength>* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper<SVGLength>* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGLength, JSSVGPODTypeWrapper<SVGLength> >(exec, object, context); } -SVGLength toSVGLength(JSC::JSValuePtr value) +SVGLength toSVGLength(JSC::JSValue value) { - return value->isObject(&JSSVGLength::s_info) ? (SVGLength) *static_cast<JSSVGLength*>(asObject(value))->impl() : SVGLength(); + return value.isObject(&JSSVGLength::s_info) ? (SVGLength) *static_cast<JSSVGLength*>(asObject(value))->impl() : SVGLength(); } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGLength.h b/src/3rdparty/webkit/WebCore/generated/JSSVGLength.h index 167ca56afb..bdcdcb0f82 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGLength.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGLength.h @@ -37,24 +37,24 @@ class JSSVGLength : public DOMObject { public: JSSVGLength(PassRefPtr<JSC::Structure>, PassRefPtr<JSSVGPODTypeWrapper<SVGLength> >, SVGElement* context); virtual ~JSSVGLength(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom attributes - JSC::JSValuePtr value(JSC::ExecState*) const; + JSC::JSValue value(JSC::ExecState*) const; // Custom functions - JSC::JSValuePtr convertToSpecifiedUnits(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue convertToSpecifiedUnits(JSC::ExecState*, const JSC::ArgList&); JSSVGPODTypeWrapper<SVGLength>* impl() const { return m_impl.get(); } SVGElement* context() const { return m_context.get(); } @@ -63,16 +63,17 @@ private: RefPtr<JSSVGPODTypeWrapper<SVGLength> > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, JSSVGPODTypeWrapper<SVGLength>*, SVGElement* context); -SVGLength toSVGLength(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, JSSVGPODTypeWrapper<SVGLength>*, SVGElement* context); +SVGLength toSVGLength(JSC::JSValue); class JSSVGLengthPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -81,31 +82,31 @@ public: // Functions -JSC::JSValuePtr jsSVGLengthPrototypeFunctionNewValueSpecifiedUnits(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGLengthPrototypeFunctionConvertToSpecifiedUnits(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGLengthPrototypeFunctionNewValueSpecifiedUnits(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGLengthPrototypeFunctionConvertToSpecifiedUnits(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGLengthUnitType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLengthValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGLengthValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGLengthValueInSpecifiedUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGLengthValueInSpecifiedUnits(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGLengthValueAsString(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGLengthValueAsString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGLengthConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLengthUnitType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLengthValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGLengthValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGLengthValueInSpecifiedUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGLengthValueInSpecifiedUnits(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGLengthValueAsString(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGLengthValueAsString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGLengthConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGLengthSVG_LENGTHTYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLengthSVG_LENGTHTYPE_NUMBER(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLengthSVG_LENGTHTYPE_PERCENTAGE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLengthSVG_LENGTHTYPE_EMS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLengthSVG_LENGTHTYPE_EXS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLengthSVG_LENGTHTYPE_PX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLengthSVG_LENGTHTYPE_CM(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLengthSVG_LENGTHTYPE_MM(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLengthSVG_LENGTHTYPE_IN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLengthSVG_LENGTHTYPE_PT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLengthSVG_LENGTHTYPE_PC(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLengthSVG_LENGTHTYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLengthSVG_LENGTHTYPE_NUMBER(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLengthSVG_LENGTHTYPE_PERCENTAGE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLengthSVG_LENGTHTYPE_EMS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLengthSVG_LENGTHTYPE_EXS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLengthSVG_LENGTHTYPE_PX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLengthSVG_LENGTHTYPE_CM(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLengthSVG_LENGTHTYPE_MM(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLengthSVG_LENGTHTYPE_IN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLengthSVG_LENGTHTYPE_PT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLengthSVG_LENGTHTYPE_PC(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGLengthList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGLengthList.cpp index 6dc9a6a0f6..85d2c3232b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGLengthList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGLengthList.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGLengthList) +ASSERT_CLASS_FITS_IN_CELL(JSSVGLengthList); /* Hash table */ @@ -79,9 +79,9 @@ static const HashTable JSSVGLengthListPrototypeTable = const ClassInfo JSSVGLengthListPrototype::s_info = { "SVGLengthListPrototype", 0, &JSSVGLengthListPrototypeTable, 0 }; -JSObject* JSSVGLengthListPrototype::self(ExecState* exec) +JSObject* JSSVGLengthListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGLengthList>(exec); + return getDOMPrototype<JSSVGLengthList>(exec, globalObject); } bool JSSVGLengthListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -101,12 +101,11 @@ JSSVGLengthList::JSSVGLengthList(PassRefPtr<Structure> structure, PassRefPtr<SVG JSSVGLengthList::~JSSVGLengthList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGLengthList::createPrototype(ExecState* exec) +JSObject* JSSVGLengthList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGLengthListPrototype(JSSVGLengthListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGLengthListPrototype(JSSVGLengthListPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGLengthList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -114,15 +113,17 @@ bool JSSVGLengthList::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSSVGLengthList, Base>(exec, &JSSVGLengthListTable, this, propertyName, slot); } -JSValuePtr jsSVGLengthListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLengthListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLengthList* imp = static_cast<SVGLengthList*>(static_cast<JSSVGLengthList*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->numberOfItems()); } -JSValuePtr jsSVGLengthListPrototypeFunctionClear(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionClear(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGLengthList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGLengthList::s_info)) return throwError(exec, TypeError); JSSVGLengthList* castedThisObj = static_cast<JSSVGLengthList*>(asObject(thisValue)); SVGLengthList* imp = static_cast<SVGLengthList*>(castedThisObj->impl()); @@ -133,105 +134,111 @@ JSValuePtr jsSVGLengthListPrototypeFunctionClear(ExecState* exec, JSObject*, JSV return jsUndefined(); } -JSValuePtr jsSVGLengthListPrototypeFunctionInitialize(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionInitialize(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGLengthList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGLengthList::s_info)) return throwError(exec, TypeError); JSSVGLengthList* castedThisObj = static_cast<JSSVGLengthList*>(asObject(thisValue)); SVGLengthList* imp = static_cast<SVGLengthList*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGLength item = toSVGLength(args.at(exec, 0)); + SVGLength item = toSVGLength(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGLength>::create(imp->initialize(item, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGLength>::create(imp->initialize(item, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGLengthListPrototypeFunctionGetItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionGetItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGLengthList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGLengthList::s_info)) return throwError(exec, TypeError); JSSVGLengthList* castedThisObj = static_cast<JSSVGLengthList*>(asObject(thisValue)); SVGLengthList* imp = static_cast<SVGLengthList*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGLength>::create(imp->getItem(index, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGLength>::create(imp->getItem(index, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGLengthListPrototypeFunctionInsertItemBefore(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionInsertItemBefore(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGLengthList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGLengthList::s_info)) return throwError(exec, TypeError); JSSVGLengthList* castedThisObj = static_cast<JSSVGLengthList*>(asObject(thisValue)); SVGLengthList* imp = static_cast<SVGLengthList*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGLength item = toSVGLength(args.at(exec, 0)); - unsigned index = args.at(exec, 1)->toInt32(exec); + SVGLength item = toSVGLength(args.at(0)); + unsigned index = args.at(1).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGLength>::create(imp->insertItemBefore(item, index, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGLength>::create(imp->insertItemBefore(item, index, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGLengthListPrototypeFunctionReplaceItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionReplaceItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGLengthList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGLengthList::s_info)) return throwError(exec, TypeError); JSSVGLengthList* castedThisObj = static_cast<JSSVGLengthList*>(asObject(thisValue)); SVGLengthList* imp = static_cast<SVGLengthList*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGLength item = toSVGLength(args.at(exec, 0)); - unsigned index = args.at(exec, 1)->toInt32(exec); + SVGLength item = toSVGLength(args.at(0)); + unsigned index = args.at(1).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGLength>::create(imp->replaceItem(item, index, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGLength>::create(imp->replaceItem(item, index, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGLengthListPrototypeFunctionRemoveItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionRemoveItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGLengthList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGLengthList::s_info)) return throwError(exec, TypeError); JSSVGLengthList* castedThisObj = static_cast<JSSVGLengthList*>(asObject(thisValue)); SVGLengthList* imp = static_cast<SVGLengthList*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGLength>::create(imp->removeItem(index, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGLength>::create(imp->removeItem(index, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGLengthListPrototypeFunctionAppendItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionAppendItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGLengthList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGLengthList::s_info)) return throwError(exec, TypeError); JSSVGLengthList* castedThisObj = static_cast<JSSVGLengthList*>(asObject(thisValue)); SVGLengthList* imp = static_cast<SVGLengthList*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGLength item = toSVGLength(args.at(exec, 0)); + SVGLength item = toSVGLength(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGLength>::create(imp->appendItem(item, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGLength>::create(imp->appendItem(item, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGLengthList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGLengthList* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGLengthList>(exec, object, context); } -SVGLengthList* toSVGLengthList(JSC::JSValuePtr value) +SVGLengthList* toSVGLengthList(JSC::JSValue value) { - return value->isObject(&JSSVGLengthList::s_info) ? static_cast<JSSVGLengthList*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGLengthList::s_info) ? static_cast<JSSVGLengthList*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGLengthList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGLengthList.h index 0a1c4f7908..7edb82429b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGLengthList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGLengthList.h @@ -37,12 +37,12 @@ class JSSVGLengthList : public DOMObject { public: JSSVGLengthList(PassRefPtr<JSC::Structure>, PassRefPtr<SVGLengthList>, SVGElement* context); virtual ~JSSVGLengthList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -55,16 +55,17 @@ private: RefPtr<SVGLengthList > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGLengthList*, SVGElement* context); -SVGLengthList* toSVGLengthList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGLengthList*, SVGElement* context); +SVGLengthList* toSVGLengthList(JSC::JSValue); class JSSVGLengthListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -73,16 +74,16 @@ public: // Functions -JSC::JSValuePtr jsSVGLengthListPrototypeFunctionClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGLengthListPrototypeFunctionInitialize(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGLengthListPrototypeFunctionGetItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGLengthListPrototypeFunctionInsertItemBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGLengthListPrototypeFunctionReplaceItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGLengthListPrototypeFunctionRemoveItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGLengthListPrototypeFunctionAppendItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionInitialize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionGetItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionInsertItemBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionReplaceItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionRemoveItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionAppendItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGLengthListNumberOfItems(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLengthListNumberOfItems(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGLineElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGLineElement.cpp index 1116d77bdd..d0d6dcea49 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGLineElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGLineElement.cpp @@ -53,7 +53,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGLineElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGLineElement); /* Hash table */ @@ -106,9 +106,9 @@ static const HashTable JSSVGLineElementPrototypeTable = const ClassInfo JSSVGLineElementPrototype::s_info = { "SVGLineElementPrototype", 0, &JSSVGLineElementPrototypeTable, 0 }; -JSObject* JSSVGLineElementPrototype::self(ExecState* exec) +JSObject* JSSVGLineElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGLineElement>(exec); + return getDOMPrototype<JSSVGLineElement>(exec, globalObject); } bool JSSVGLineElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -123,9 +123,9 @@ JSSVGLineElement::JSSVGLineElement(PassRefPtr<Structure> structure, PassRefPtr<S { } -JSObject* JSSVGLineElement::createPrototype(ExecState* exec) +JSObject* JSSVGLineElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGLineElementPrototype(JSSVGLineElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGLineElementPrototype(JSSVGLineElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGLineElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -133,193 +133,214 @@ bool JSSVGLineElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSSVGLineElement, Base>(exec, &JSSVGLineElementTable, this, propertyName, slot); } -JSValuePtr jsSVGLineElementX1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLineElementX1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->x1Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGLineElementY1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLineElementY1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->y1Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGLineElementX2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLineElementX2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->x2Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGLineElementY2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLineElementY2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->y2Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGLineElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLineElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGLineElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLineElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGLineElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLineElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGLineElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLineElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGLineElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLineElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGLineElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLineElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGLineElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLineElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGLineElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLineElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGLineElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLineElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->transformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGLineElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLineElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGLineElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLineElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -void JSSVGLineElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGLineElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGLineElement, Base>(exec, propertyName, value, &JSSVGLineElementTable, this, slot); } -void setJSSVGLineElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGLineElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGLineElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGLineElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGLineElement* imp = static_cast<SVGLineElement*>(static_cast<JSSVGLineElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGLineElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGLineElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGLineElement::s_info)) return throwError(exec, TypeError); JSSVGLineElement* castedThisObj = static_cast<JSSVGLineElement*>(asObject(thisValue)); SVGLineElement* imp = static_cast<SVGLineElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGLineElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGLineElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGLineElement::s_info)) return throwError(exec, TypeError); JSSVGLineElement* castedThisObj = static_cast<JSSVGLineElement*>(asObject(thisValue)); SVGLineElement* imp = static_cast<SVGLineElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } -JSValuePtr jsSVGLineElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGLineElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGLineElement::s_info)) return throwError(exec, TypeError); JSSVGLineElement* castedThisObj = static_cast<JSSVGLineElement*>(asObject(thisValue)); SVGLineElement* imp = static_cast<SVGLineElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGLineElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGLineElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGLineElement::s_info)) return throwError(exec, TypeError); JSSVGLineElement* castedThisObj = static_cast<JSSVGLineElement*>(asObject(thisValue)); SVGLineElement* imp = static_cast<SVGLineElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGLineElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGLineElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGLineElement::s_info)) return throwError(exec, TypeError); JSSVGLineElement* castedThisObj = static_cast<JSSVGLineElement*>(asObject(thisValue)); SVGLineElement* imp = static_cast<SVGLineElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGLineElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGLineElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGLineElement::s_info)) return throwError(exec, TypeError); JSSVGLineElement* castedThisObj = static_cast<JSSVGLineElement*>(asObject(thisValue)); SVGLineElement* imp = static_cast<SVGLineElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGLineElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGLineElement.h index 62df2b8889..b908d47e48 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGLineElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGLineElement.h @@ -34,13 +34,13 @@ class JSSVGLineElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGLineElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGLineElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGLineElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,31 +64,31 @@ public: // Functions -JSC::JSValuePtr jsSVGLineElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGLineElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGLineElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGLineElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGLineElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGLineElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGLineElementX1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLineElementY1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLineElementX2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLineElementY2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLineElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLineElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLineElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLineElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGLineElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGLineElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGLineElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGLineElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLineElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLineElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLineElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLineElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLineElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLineElementX1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLineElementY1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLineElementX2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLineElementY2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLineElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLineElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLineElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLineElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGLineElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGLineElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGLineElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGLineElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLineElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLineElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLineElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLineElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLineElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGLinearGradientElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGLinearGradientElement.cpp index c471ee553c..6dc0b5f7af 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGLinearGradientElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGLinearGradientElement.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGLinearGradientElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGLinearGradientElement); /* Hash table */ @@ -72,9 +72,9 @@ static const HashTable JSSVGLinearGradientElementPrototypeTable = const ClassInfo JSSVGLinearGradientElementPrototype::s_info = { "SVGLinearGradientElementPrototype", 0, &JSSVGLinearGradientElementPrototypeTable, 0 }; -JSObject* JSSVGLinearGradientElementPrototype::self(ExecState* exec) +JSObject* JSSVGLinearGradientElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGLinearGradientElement>(exec); + return getDOMPrototype<JSSVGLinearGradientElement>(exec, globalObject); } const ClassInfo JSSVGLinearGradientElement::s_info = { "SVGLinearGradientElement", &JSSVGGradientElement::s_info, &JSSVGLinearGradientElementTable, 0 }; @@ -84,9 +84,9 @@ JSSVGLinearGradientElement::JSSVGLinearGradientElement(PassRefPtr<Structure> str { } -JSObject* JSSVGLinearGradientElement::createPrototype(ExecState* exec) +JSObject* JSSVGLinearGradientElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGLinearGradientElementPrototype(JSSVGLinearGradientElementPrototype::createStructure(JSSVGGradientElementPrototype::self(exec))); + return new (exec) JSSVGLinearGradientElementPrototype(JSSVGLinearGradientElementPrototype::createStructure(JSSVGGradientElementPrototype::self(exec, globalObject))); } bool JSSVGLinearGradientElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -94,29 +94,33 @@ bool JSSVGLinearGradientElement::getOwnPropertySlot(ExecState* exec, const Ident return getStaticValueSlot<JSSVGLinearGradientElement, Base>(exec, &JSSVGLinearGradientElementTable, this, propertyName, slot); } -JSValuePtr jsSVGLinearGradientElementX1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLinearGradientElementX1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLinearGradientElement* imp = static_cast<SVGLinearGradientElement*>(static_cast<JSSVGLinearGradientElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->x1Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGLinearGradientElementY1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLinearGradientElementY1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLinearGradientElement* imp = static_cast<SVGLinearGradientElement*>(static_cast<JSSVGLinearGradientElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->y1Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGLinearGradientElementX2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLinearGradientElementX2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLinearGradientElement* imp = static_cast<SVGLinearGradientElement*>(static_cast<JSSVGLinearGradientElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->x2Animated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGLinearGradientElementY2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGLinearGradientElementY2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGLinearGradientElement* imp = static_cast<SVGLinearGradientElement*>(static_cast<JSSVGLinearGradientElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->y2Animated(); return toJS(exec, obj.get(), imp); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGLinearGradientElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGLinearGradientElement.h index 95a0a5c0be..8e002a5696 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGLinearGradientElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGLinearGradientElement.h @@ -34,12 +34,12 @@ class JSSVGLinearGradientElement : public JSSVGGradientElement { typedef JSSVGGradientElement Base; public: JSSVGLinearGradientElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGLinearGradientElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,8 +48,9 @@ public: class JSSVGLinearGradientElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGLinearGradientElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -57,10 +58,10 @@ public: // Attributes -JSC::JSValuePtr jsSVGLinearGradientElementX1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLinearGradientElementY1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLinearGradientElementX2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGLinearGradientElementY2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLinearGradientElementX1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLinearGradientElementY1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLinearGradientElementX2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGLinearGradientElementY2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMarkerElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGMarkerElement.cpp index f707924387..aa44a04652 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMarkerElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMarkerElement.cpp @@ -52,7 +52,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGMarkerElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGMarkerElement); /* Hash table */ @@ -108,13 +108,13 @@ public: JSSVGMarkerElementConstructor(ExecState* exec) : DOMObject(JSSVGMarkerElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGMarkerElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGMarkerElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -152,9 +152,9 @@ static const HashTable JSSVGMarkerElementPrototypeTable = const ClassInfo JSSVGMarkerElementPrototype::s_info = { "SVGMarkerElementPrototype", 0, &JSSVGMarkerElementPrototypeTable, 0 }; -JSObject* JSSVGMarkerElementPrototype::self(ExecState* exec) +JSObject* JSSVGMarkerElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGMarkerElement>(exec); + return getDOMPrototype<JSSVGMarkerElement>(exec, globalObject); } bool JSSVGMarkerElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -169,9 +169,9 @@ JSSVGMarkerElement::JSSVGMarkerElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSSVGMarkerElement::createPrototype(ExecState* exec) +JSObject* JSSVGMarkerElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGMarkerElementPrototype(JSSVGMarkerElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGMarkerElementPrototype(JSSVGMarkerElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGMarkerElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -179,130 +179,145 @@ bool JSSVGMarkerElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSSVGMarkerElement, Base>(exec, &JSSVGMarkerElementTable, this, propertyName, slot); } -JSValuePtr jsSVGMarkerElementRefX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMarkerElementRefX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(static_cast<JSSVGMarkerElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->refXAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMarkerElementRefY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMarkerElementRefY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(static_cast<JSSVGMarkerElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->refYAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMarkerElementMarkerUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMarkerElementMarkerUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(static_cast<JSSVGMarkerElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->markerUnitsAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMarkerElementMarkerWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMarkerElementMarkerWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(static_cast<JSSVGMarkerElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->markerWidthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMarkerElementMarkerHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMarkerElementMarkerHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(static_cast<JSSVGMarkerElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->markerHeightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMarkerElementOrientType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMarkerElementOrientType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(static_cast<JSSVGMarkerElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->orientTypeAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMarkerElementOrientAngle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMarkerElementOrientAngle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(static_cast<JSSVGMarkerElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedAngle> obj = imp->orientAngleAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMarkerElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMarkerElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(static_cast<JSSVGMarkerElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGMarkerElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMarkerElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(static_cast<JSSVGMarkerElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGMarkerElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMarkerElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(static_cast<JSSVGMarkerElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMarkerElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMarkerElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(static_cast<JSSVGMarkerElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMarkerElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMarkerElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(static_cast<JSSVGMarkerElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGMarkerElementViewBox(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMarkerElementViewBox(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(static_cast<JSSVGMarkerElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedRect> obj = imp->viewBoxAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMarkerElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMarkerElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(static_cast<JSSVGMarkerElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedPreserveAspectRatio> obj = imp->preserveAspectRatioAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMarkerElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMarkerElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGMarkerElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSSVGMarkerElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGMarkerElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGMarkerElement, Base>(exec, propertyName, value, &JSSVGMarkerElementTable, this, slot); } -void setJSSVGMarkerElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGMarkerElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(static_cast<JSSVGMarkerElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGMarkerElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGMarkerElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(static_cast<JSSVGMarkerElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr JSSVGMarkerElement::getConstructor(ExecState* exec) +JSValue JSSVGMarkerElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGMarkerElementConstructor>(exec); } -JSValuePtr jsSVGMarkerElementPrototypeFunctionSetOrientToAuto(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGMarkerElementPrototypeFunctionSetOrientToAuto(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGMarkerElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGMarkerElement::s_info)) return throwError(exec, TypeError); JSSVGMarkerElement* castedThisObj = static_cast<JSSVGMarkerElement*>(asObject(thisValue)); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(castedThisObj->impl()); @@ -311,59 +326,61 @@ JSValuePtr jsSVGMarkerElementPrototypeFunctionSetOrientToAuto(ExecState* exec, J return jsUndefined(); } -JSValuePtr jsSVGMarkerElementPrototypeFunctionSetOrientToAngle(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGMarkerElementPrototypeFunctionSetOrientToAngle(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGMarkerElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGMarkerElement::s_info)) return throwError(exec, TypeError); JSSVGMarkerElement* castedThisObj = static_cast<JSSVGMarkerElement*>(asObject(thisValue)); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(castedThisObj->impl()); - SVGAngle* angle = toSVGAngle(args.at(exec, 0)); + SVGAngle* angle = toSVGAngle(args.at(0)); imp->setOrientToAngle(angle); return jsUndefined(); } -JSValuePtr jsSVGMarkerElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGMarkerElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGMarkerElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGMarkerElement::s_info)) return throwError(exec, TypeError); JSSVGMarkerElement* castedThisObj = static_cast<JSSVGMarkerElement*>(asObject(thisValue)); SVGMarkerElement* imp = static_cast<SVGMarkerElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } // Constant getters -JSValuePtr jsSVGMarkerElementSVG_MARKERUNITS_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGMarkerElementSVG_MARKERUNITS_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGMarkerElementSVG_MARKERUNITS_USERSPACEONUSE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGMarkerElementSVG_MARKERUNITS_USERSPACEONUSE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGMarkerElementSVG_MARKERUNITS_STROKEWIDTH(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGMarkerElementSVG_MARKERUNITS_STROKEWIDTH(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGMarkerElementSVG_MARKER_ORIENT_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGMarkerElementSVG_MARKER_ORIENT_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGMarkerElementSVG_MARKER_ORIENT_AUTO(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGMarkerElementSVG_MARKER_ORIENT_AUTO(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGMarkerElementSVG_MARKER_ORIENT_ANGLE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGMarkerElementSVG_MARKER_ORIENT_ANGLE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMarkerElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGMarkerElement.h index 9bdd93d8e7..e9042c8e6a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMarkerElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMarkerElement.h @@ -34,28 +34,29 @@ class JSSVGMarkerElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGMarkerElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGMarkerElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSSVGMarkerElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -64,36 +65,36 @@ public: // Functions -JSC::JSValuePtr jsSVGMarkerElementPrototypeFunctionSetOrientToAuto(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGMarkerElementPrototypeFunctionSetOrientToAngle(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGMarkerElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGMarkerElementPrototypeFunctionSetOrientToAuto(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGMarkerElementPrototypeFunctionSetOrientToAngle(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGMarkerElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGMarkerElementRefX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementRefY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementMarkerUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementMarkerWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementMarkerHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementOrientType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementOrientAngle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGMarkerElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGMarkerElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGMarkerElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGMarkerElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementViewBox(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementPreserveAspectRatio(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementRefX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementRefY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementMarkerUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementMarkerWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementMarkerHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementOrientType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementOrientAngle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGMarkerElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGMarkerElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGMarkerElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGMarkerElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementViewBox(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementPreserveAspectRatio(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGMarkerElementSVG_MARKERUNITS_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementSVG_MARKERUNITS_USERSPACEONUSE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementSVG_MARKERUNITS_STROKEWIDTH(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementSVG_MARKER_ORIENT_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementSVG_MARKER_ORIENT_AUTO(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMarkerElementSVG_MARKER_ORIENT_ANGLE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementSVG_MARKERUNITS_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementSVG_MARKERUNITS_USERSPACEONUSE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementSVG_MARKERUNITS_STROKEWIDTH(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementSVG_MARKER_ORIENT_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementSVG_MARKER_ORIENT_AUTO(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMarkerElementSVG_MARKER_ORIENT_ANGLE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMaskElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGMaskElement.cpp index 2ac2f2e3f5..79ad8c857d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMaskElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMaskElement.cpp @@ -49,7 +49,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGMaskElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGMaskElement); /* Hash table */ @@ -97,9 +97,9 @@ static const HashTable JSSVGMaskElementPrototypeTable = const ClassInfo JSSVGMaskElementPrototype::s_info = { "SVGMaskElementPrototype", 0, &JSSVGMaskElementPrototypeTable, 0 }; -JSObject* JSSVGMaskElementPrototype::self(ExecState* exec) +JSObject* JSSVGMaskElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGMaskElement>(exec); + return getDOMPrototype<JSSVGMaskElement>(exec, globalObject); } bool JSSVGMaskElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -114,9 +114,9 @@ JSSVGMaskElement::JSSVGMaskElement(PassRefPtr<Structure> structure, PassRefPtr<S { } -JSObject* JSSVGMaskElement::createPrototype(ExecState* exec) +JSObject* JSSVGMaskElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGMaskElementPrototype(JSSVGMaskElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGMaskElementPrototype(JSSVGMaskElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGMaskElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -124,138 +124,154 @@ bool JSSVGMaskElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSSVGMaskElement, Base>(exec, &JSSVGMaskElementTable, this, propertyName, slot); } -JSValuePtr jsSVGMaskElementMaskUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMaskElementMaskUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMaskElement* imp = static_cast<SVGMaskElement*>(static_cast<JSSVGMaskElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->maskUnitsAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMaskElementMaskContentUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMaskElementMaskContentUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMaskElement* imp = static_cast<SVGMaskElement*>(static_cast<JSSVGMaskElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->maskContentUnitsAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMaskElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMaskElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMaskElement* imp = static_cast<SVGMaskElement*>(static_cast<JSSVGMaskElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMaskElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMaskElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMaskElement* imp = static_cast<SVGMaskElement*>(static_cast<JSSVGMaskElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMaskElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMaskElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMaskElement* imp = static_cast<SVGMaskElement*>(static_cast<JSSVGMaskElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMaskElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMaskElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMaskElement* imp = static_cast<SVGMaskElement*>(static_cast<JSSVGMaskElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMaskElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMaskElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMaskElement* imp = static_cast<SVGMaskElement*>(static_cast<JSSVGMaskElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGMaskElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMaskElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMaskElement* imp = static_cast<SVGMaskElement*>(static_cast<JSSVGMaskElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGMaskElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMaskElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMaskElement* imp = static_cast<SVGMaskElement*>(static_cast<JSSVGMaskElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGMaskElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMaskElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMaskElement* imp = static_cast<SVGMaskElement*>(static_cast<JSSVGMaskElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGMaskElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMaskElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMaskElement* imp = static_cast<SVGMaskElement*>(static_cast<JSSVGMaskElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGMaskElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMaskElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMaskElement* imp = static_cast<SVGMaskElement*>(static_cast<JSSVGMaskElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMaskElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMaskElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMaskElement* imp = static_cast<SVGMaskElement*>(static_cast<JSSVGMaskElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGMaskElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMaskElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGMaskElement* imp = static_cast<SVGMaskElement*>(static_cast<JSSVGMaskElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -void JSSVGMaskElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGMaskElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGMaskElement, Base>(exec, propertyName, value, &JSSVGMaskElementTable, this, slot); } -void setJSSVGMaskElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGMaskElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGMaskElement* imp = static_cast<SVGMaskElement*>(static_cast<JSSVGMaskElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGMaskElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGMaskElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGMaskElement* imp = static_cast<SVGMaskElement*>(static_cast<JSSVGMaskElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGMaskElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGMaskElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGMaskElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGMaskElement::s_info)) return throwError(exec, TypeError); JSSVGMaskElement* castedThisObj = static_cast<JSSVGMaskElement*>(asObject(thisValue)); SVGMaskElement* imp = static_cast<SVGMaskElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGMaskElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGMaskElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGMaskElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGMaskElement::s_info)) return throwError(exec, TypeError); JSSVGMaskElement* castedThisObj = static_cast<JSSVGMaskElement*>(asObject(thisValue)); SVGMaskElement* imp = static_cast<SVGMaskElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMaskElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGMaskElement.h index dbe6b78b29..364ba4f8c1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMaskElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMaskElement.h @@ -34,13 +34,13 @@ class JSSVGMaskElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGMaskElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGMaskElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGMaskElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,26 +64,26 @@ public: // Functions -JSC::JSValuePtr jsSVGMaskElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGMaskElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGMaskElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGMaskElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGMaskElementMaskUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMaskElementMaskContentUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMaskElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMaskElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMaskElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMaskElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMaskElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMaskElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMaskElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMaskElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGMaskElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGMaskElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGMaskElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGMaskElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMaskElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGMaskElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMaskElementMaskUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMaskElementMaskContentUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMaskElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMaskElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMaskElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMaskElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMaskElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMaskElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMaskElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMaskElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGMaskElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGMaskElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGMaskElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGMaskElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMaskElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGMaskElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMatrix.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGMatrix.cpp index 66c0b2cc04..5be4fb0eee 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMatrix.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMatrix.cpp @@ -28,6 +28,7 @@ #include <wtf/GetPtr.h> +#include "JSSVGMatrix.h" #include <runtime/Error.h> #include <runtime/JSNumberCell.h> @@ -36,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGMatrix) +ASSERT_CLASS_FITS_IN_CELL(JSSVGMatrix); /* Hash table */ @@ -85,9 +86,9 @@ static const HashTable JSSVGMatrixPrototypeTable = const ClassInfo JSSVGMatrixPrototype::s_info = { "SVGMatrixPrototype", 0, &JSSVGMatrixPrototypeTable, 0 }; -JSObject* JSSVGMatrixPrototype::self(ExecState* exec) +JSObject* JSSVGMatrixPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGMatrix>(exec); + return getDOMPrototype<JSSVGMatrix>(exec, globalObject); } bool JSSVGMatrixPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -107,12 +108,11 @@ JSSVGMatrix::JSSVGMatrix(PassRefPtr<Structure> structure, PassRefPtr<JSSVGPODTyp JSSVGMatrix::~JSSVGMatrix() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGMatrix::createPrototype(ExecState* exec) +JSObject* JSSVGMatrix::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGMatrixPrototype(JSSVGMatrixPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGMatrixPrototype(JSSVGMatrixPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGMatrix::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -120,184 +120,255 @@ bool JSSVGMatrix::getOwnPropertySlot(ExecState* exec, const Identifier& property return getStaticValueSlot<JSSVGMatrix, Base>(exec, &JSSVGMatrixTable, this, propertyName, slot); } -JSValuePtr jsSVGMatrixA(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMatrixA(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); TransformationMatrix imp(*static_cast<JSSVGMatrix*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp.a()); } -JSValuePtr jsSVGMatrixB(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMatrixB(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); TransformationMatrix imp(*static_cast<JSSVGMatrix*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp.b()); } -JSValuePtr jsSVGMatrixC(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMatrixC(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); TransformationMatrix imp(*static_cast<JSSVGMatrix*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp.c()); } -JSValuePtr jsSVGMatrixD(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMatrixD(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); TransformationMatrix imp(*static_cast<JSSVGMatrix*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp.d()); } -JSValuePtr jsSVGMatrixE(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMatrixE(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); TransformationMatrix imp(*static_cast<JSSVGMatrix*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp.e()); } -JSValuePtr jsSVGMatrixF(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGMatrixF(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); TransformationMatrix imp(*static_cast<JSSVGMatrix*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp.f()); } -void JSSVGMatrix::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGMatrix::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGMatrix, Base>(exec, propertyName, value, &JSSVGMatrixTable, this, slot); } -void setJSSVGMatrixA(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGMatrixA(ExecState* exec, JSObject* thisObject, JSValue value) { TransformationMatrix imp(*static_cast<JSSVGMatrix*>(thisObject)->impl()); - imp.setA(value->toNumber(exec)); + imp.setA(value.toNumber(exec)); static_cast<JSSVGMatrix*>(thisObject)->impl()->commitChange(imp, static_cast<JSSVGMatrix*>(thisObject)->context()); } -void setJSSVGMatrixB(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGMatrixB(ExecState* exec, JSObject* thisObject, JSValue value) { TransformationMatrix imp(*static_cast<JSSVGMatrix*>(thisObject)->impl()); - imp.setB(value->toNumber(exec)); + imp.setB(value.toNumber(exec)); static_cast<JSSVGMatrix*>(thisObject)->impl()->commitChange(imp, static_cast<JSSVGMatrix*>(thisObject)->context()); } -void setJSSVGMatrixC(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGMatrixC(ExecState* exec, JSObject* thisObject, JSValue value) { TransformationMatrix imp(*static_cast<JSSVGMatrix*>(thisObject)->impl()); - imp.setC(value->toNumber(exec)); + imp.setC(value.toNumber(exec)); static_cast<JSSVGMatrix*>(thisObject)->impl()->commitChange(imp, static_cast<JSSVGMatrix*>(thisObject)->context()); } -void setJSSVGMatrixD(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGMatrixD(ExecState* exec, JSObject* thisObject, JSValue value) { TransformationMatrix imp(*static_cast<JSSVGMatrix*>(thisObject)->impl()); - imp.setD(value->toNumber(exec)); + imp.setD(value.toNumber(exec)); static_cast<JSSVGMatrix*>(thisObject)->impl()->commitChange(imp, static_cast<JSSVGMatrix*>(thisObject)->context()); } -void setJSSVGMatrixE(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGMatrixE(ExecState* exec, JSObject* thisObject, JSValue value) { TransformationMatrix imp(*static_cast<JSSVGMatrix*>(thisObject)->impl()); - imp.setE(value->toNumber(exec)); + imp.setE(value.toNumber(exec)); static_cast<JSSVGMatrix*>(thisObject)->impl()->commitChange(imp, static_cast<JSSVGMatrix*>(thisObject)->context()); } -void setJSSVGMatrixF(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGMatrixF(ExecState* exec, JSObject* thisObject, JSValue value) { TransformationMatrix imp(*static_cast<JSSVGMatrix*>(thisObject)->impl()); - imp.setF(value->toNumber(exec)); + imp.setF(value.toNumber(exec)); static_cast<JSSVGMatrix*>(thisObject)->impl()->commitChange(imp, static_cast<JSSVGMatrix*>(thisObject)->context()); } -JSValuePtr jsSVGMatrixPrototypeFunctionMultiply(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionMultiply(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGMatrix::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGMatrix::s_info)) return throwError(exec, TypeError); JSSVGMatrix* castedThisObj = static_cast<JSSVGMatrix*>(asObject(thisValue)); - return castedThisObj->multiply(exec, args); + JSSVGPODTypeWrapper<TransformationMatrix>* wrapper = castedThisObj->impl(); + TransformationMatrix imp(*wrapper); + TransformationMatrix secondMatrix = toSVGMatrix(args.at(0)); + + + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp.multiply(secondMatrix)).get(), castedThisObj->context()); + return result; } -JSValuePtr jsSVGMatrixPrototypeFunctionInverse(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionInverse(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGMatrix::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGMatrix::s_info)) return throwError(exec, TypeError); JSSVGMatrix* castedThisObj = static_cast<JSSVGMatrix*>(asObject(thisValue)); return castedThisObj->inverse(exec, args); } -JSValuePtr jsSVGMatrixPrototypeFunctionTranslate(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionTranslate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGMatrix::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGMatrix::s_info)) return throwError(exec, TypeError); JSSVGMatrix* castedThisObj = static_cast<JSSVGMatrix*>(asObject(thisValue)); - return castedThisObj->translate(exec, args); + JSSVGPODTypeWrapper<TransformationMatrix>* wrapper = castedThisObj->impl(); + TransformationMatrix imp(*wrapper); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); + + + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp.translate(x, y)).get(), castedThisObj->context()); + return result; } -JSValuePtr jsSVGMatrixPrototypeFunctionScale(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionScale(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGMatrix::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGMatrix::s_info)) return throwError(exec, TypeError); JSSVGMatrix* castedThisObj = static_cast<JSSVGMatrix*>(asObject(thisValue)); - return castedThisObj->scale(exec, args); + JSSVGPODTypeWrapper<TransformationMatrix>* wrapper = castedThisObj->impl(); + TransformationMatrix imp(*wrapper); + float scaleFactor = args.at(0).toFloat(exec); + + + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp.scale(scaleFactor)).get(), castedThisObj->context()); + return result; } -JSValuePtr jsSVGMatrixPrototypeFunctionScaleNonUniform(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionScaleNonUniform(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGMatrix::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGMatrix::s_info)) return throwError(exec, TypeError); JSSVGMatrix* castedThisObj = static_cast<JSSVGMatrix*>(asObject(thisValue)); - return castedThisObj->scaleNonUniform(exec, args); + JSSVGPODTypeWrapper<TransformationMatrix>* wrapper = castedThisObj->impl(); + TransformationMatrix imp(*wrapper); + float scaleFactorX = args.at(0).toFloat(exec); + float scaleFactorY = args.at(1).toFloat(exec); + + + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp.scaleNonUniform(scaleFactorX, scaleFactorY)).get(), castedThisObj->context()); + return result; } -JSValuePtr jsSVGMatrixPrototypeFunctionRotate(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionRotate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGMatrix::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGMatrix::s_info)) return throwError(exec, TypeError); JSSVGMatrix* castedThisObj = static_cast<JSSVGMatrix*>(asObject(thisValue)); - return castedThisObj->rotate(exec, args); + JSSVGPODTypeWrapper<TransformationMatrix>* wrapper = castedThisObj->impl(); + TransformationMatrix imp(*wrapper); + float angle = args.at(0).toFloat(exec); + + + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp.rotate(angle)).get(), castedThisObj->context()); + return result; } -JSValuePtr jsSVGMatrixPrototypeFunctionRotateFromVector(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionRotateFromVector(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGMatrix::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGMatrix::s_info)) return throwError(exec, TypeError); JSSVGMatrix* castedThisObj = static_cast<JSSVGMatrix*>(asObject(thisValue)); return castedThisObj->rotateFromVector(exec, args); } -JSValuePtr jsSVGMatrixPrototypeFunctionFlipX(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionFlipX(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGMatrix::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGMatrix::s_info)) return throwError(exec, TypeError); JSSVGMatrix* castedThisObj = static_cast<JSSVGMatrix*>(asObject(thisValue)); - return castedThisObj->flipX(exec, args); + JSSVGPODTypeWrapper<TransformationMatrix>* wrapper = castedThisObj->impl(); + TransformationMatrix imp(*wrapper); + + + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp.flipX()).get(), castedThisObj->context()); + return result; } -JSValuePtr jsSVGMatrixPrototypeFunctionFlipY(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionFlipY(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGMatrix::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGMatrix::s_info)) return throwError(exec, TypeError); JSSVGMatrix* castedThisObj = static_cast<JSSVGMatrix*>(asObject(thisValue)); - return castedThisObj->flipY(exec, args); + JSSVGPODTypeWrapper<TransformationMatrix>* wrapper = castedThisObj->impl(); + TransformationMatrix imp(*wrapper); + + + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp.flipY()).get(), castedThisObj->context()); + return result; } -JSValuePtr jsSVGMatrixPrototypeFunctionSkewX(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionSkewX(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGMatrix::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGMatrix::s_info)) return throwError(exec, TypeError); JSSVGMatrix* castedThisObj = static_cast<JSSVGMatrix*>(asObject(thisValue)); - return castedThisObj->skewX(exec, args); + JSSVGPODTypeWrapper<TransformationMatrix>* wrapper = castedThisObj->impl(); + TransformationMatrix imp(*wrapper); + float angle = args.at(0).toFloat(exec); + + + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp.skewX(angle)).get(), castedThisObj->context()); + return result; } -JSValuePtr jsSVGMatrixPrototypeFunctionSkewY(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionSkewY(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGMatrix::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGMatrix::s_info)) return throwError(exec, TypeError); JSSVGMatrix* castedThisObj = static_cast<JSSVGMatrix*>(asObject(thisValue)); - return castedThisObj->skewY(exec, args); + JSSVGPODTypeWrapper<TransformationMatrix>* wrapper = castedThisObj->impl(); + TransformationMatrix imp(*wrapper); + float angle = args.at(0).toFloat(exec); + + + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp.skewY(angle)).get(), castedThisObj->context()); + return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper<TransformationMatrix>* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper<TransformationMatrix>* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGMatrix, JSSVGPODTypeWrapper<TransformationMatrix> >(exec, object, context); } -TransformationMatrix toSVGMatrix(JSC::JSValuePtr value) +TransformationMatrix toSVGMatrix(JSC::JSValue value) { - return value->isObject(&JSSVGMatrix::s_info) ? (TransformationMatrix) *static_cast<JSSVGMatrix*>(asObject(value))->impl() : TransformationMatrix(); + return value.isObject(&JSSVGMatrix::s_info) ? (TransformationMatrix) *static_cast<JSSVGMatrix*>(asObject(value))->impl() : TransformationMatrix(); } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMatrix.h b/src/3rdparty/webkit/WebCore/generated/JSSVGMatrix.h index 0d8b249387..3c9eed736e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMatrix.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMatrix.h @@ -37,30 +37,21 @@ class JSSVGMatrix : public DOMObject { public: JSSVGMatrix(PassRefPtr<JSC::Structure>, PassRefPtr<JSSVGPODTypeWrapper<TransformationMatrix> >, SVGElement* context); virtual ~JSSVGMatrix(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } // Custom functions - JSC::JSValuePtr multiply(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr inverse(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr translate(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr scale(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr scaleNonUniform(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr rotate(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr rotateFromVector(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr flipX(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr flipY(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr skewX(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr skewY(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue inverse(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue rotateFromVector(JSC::ExecState*, const JSC::ArgList&); JSSVGPODTypeWrapper<TransformationMatrix>* impl() const { return m_impl.get(); } SVGElement* context() const { return m_context.get(); } @@ -69,16 +60,17 @@ private: RefPtr<JSSVGPODTypeWrapper<TransformationMatrix> > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, JSSVGPODTypeWrapper<TransformationMatrix>*, SVGElement* context); -TransformationMatrix toSVGMatrix(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, JSSVGPODTypeWrapper<TransformationMatrix>*, SVGElement* context); +TransformationMatrix toSVGMatrix(JSC::JSValue); class JSSVGMatrixPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -87,31 +79,31 @@ public: // Functions -JSC::JSValuePtr jsSVGMatrixPrototypeFunctionMultiply(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGMatrixPrototypeFunctionInverse(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGMatrixPrototypeFunctionTranslate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGMatrixPrototypeFunctionScale(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGMatrixPrototypeFunctionScaleNonUniform(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGMatrixPrototypeFunctionRotate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGMatrixPrototypeFunctionRotateFromVector(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGMatrixPrototypeFunctionFlipX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGMatrixPrototypeFunctionFlipY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGMatrixPrototypeFunctionSkewX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGMatrixPrototypeFunctionSkewY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionMultiply(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionInverse(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionTranslate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionScale(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionScaleNonUniform(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionRotate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionRotateFromVector(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionFlipX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionFlipY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionSkewX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionSkewY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGMatrixA(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGMatrixA(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGMatrixB(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGMatrixB(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGMatrixC(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGMatrixC(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGMatrixD(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGMatrixD(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGMatrixE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGMatrixE(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGMatrixF(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGMatrixF(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGMatrixA(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGMatrixA(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGMatrixB(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGMatrixB(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGMatrixC(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGMatrixC(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGMatrixD(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGMatrixD(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGMatrixE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGMatrixE(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGMatrixF(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGMatrixF(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMetadataElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGMetadataElement.cpp index 49acd215cf..55a5747eba 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMetadataElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMetadataElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGMetadataElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGMetadataElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGMetadataElementPrototypeTable = const ClassInfo JSSVGMetadataElementPrototype::s_info = { "SVGMetadataElementPrototype", 0, &JSSVGMetadataElementPrototypeTable, 0 }; -JSObject* JSSVGMetadataElementPrototype::self(ExecState* exec) +JSObject* JSSVGMetadataElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGMetadataElement>(exec); + return getDOMPrototype<JSSVGMetadataElement>(exec, globalObject); } const ClassInfo JSSVGMetadataElement::s_info = { "SVGMetadataElement", &JSSVGElement::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGMetadataElement::JSSVGMetadataElement(PassRefPtr<Structure> structure, Pass { } -JSObject* JSSVGMetadataElement::createPrototype(ExecState* exec) +JSObject* JSSVGMetadataElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGMetadataElementPrototype(JSSVGMetadataElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGMetadataElementPrototype(JSSVGMetadataElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMetadataElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGMetadataElement.h index 5da7044155..ad32a38cb0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMetadataElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMetadataElement.h @@ -34,7 +34,7 @@ class JSSVGMetadataElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGMetadataElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGMetadataElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGMetadataElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGMetadataElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMissingGlyphElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGMissingGlyphElement.cpp index 435a567a00..dea3c117d6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMissingGlyphElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMissingGlyphElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGMissingGlyphElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGMissingGlyphElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGMissingGlyphElementPrototypeTable = const ClassInfo JSSVGMissingGlyphElementPrototype::s_info = { "SVGMissingGlyphElementPrototype", 0, &JSSVGMissingGlyphElementPrototypeTable, 0 }; -JSObject* JSSVGMissingGlyphElementPrototype::self(ExecState* exec) +JSObject* JSSVGMissingGlyphElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGMissingGlyphElement>(exec); + return getDOMPrototype<JSSVGMissingGlyphElement>(exec, globalObject); } const ClassInfo JSSVGMissingGlyphElement::s_info = { "SVGMissingGlyphElement", &JSSVGElement::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGMissingGlyphElement::JSSVGMissingGlyphElement(PassRefPtr<Structure> structu { } -JSObject* JSSVGMissingGlyphElement::createPrototype(ExecState* exec) +JSObject* JSSVGMissingGlyphElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGMissingGlyphElementPrototype(JSSVGMissingGlyphElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGMissingGlyphElementPrototype(JSSVGMissingGlyphElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMissingGlyphElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGMissingGlyphElement.h index e696b0d4ad..cb1ed2c393 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMissingGlyphElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMissingGlyphElement.h @@ -34,7 +34,7 @@ class JSSVGMissingGlyphElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGMissingGlyphElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGMissingGlyphElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGMissingGlyphElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGMissingGlyphElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGNumber.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGNumber.cpp index 6a770afc5f..beed4c2535 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGNumber.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGNumber.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGNumber) +ASSERT_CLASS_FITS_IN_CELL(JSSVGNumber); /* Hash table */ @@ -68,9 +68,9 @@ static const HashTable JSSVGNumberPrototypeTable = const ClassInfo JSSVGNumberPrototype::s_info = { "SVGNumberPrototype", 0, &JSSVGNumberPrototypeTable, 0 }; -JSObject* JSSVGNumberPrototype::self(ExecState* exec) +JSObject* JSSVGNumberPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGNumber>(exec); + return getDOMPrototype<JSSVGNumber>(exec, globalObject); } const ClassInfo JSSVGNumber::s_info = { "SVGNumber", 0, &JSSVGNumberTable, 0 }; @@ -85,12 +85,11 @@ JSSVGNumber::JSSVGNumber(PassRefPtr<Structure> structure, PassRefPtr<JSSVGPODTyp JSSVGNumber::~JSSVGNumber() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGNumber::createPrototype(ExecState* exec) +JSObject* JSSVGNumber::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGNumberPrototype(JSSVGNumberPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGNumberPrototype(JSSVGNumberPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGNumber::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -98,31 +97,32 @@ bool JSSVGNumber::getOwnPropertySlot(ExecState* exec, const Identifier& property return getStaticValueSlot<JSSVGNumber, Base>(exec, &JSSVGNumberTable, this, propertyName, slot); } -JSValuePtr jsSVGNumberValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGNumberValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); float imp(*static_cast<JSSVGNumber*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp); } -void JSSVGNumber::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGNumber::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGNumber, Base>(exec, propertyName, value, &JSSVGNumberTable, this, slot); } -void setJSSVGNumberValue(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGNumberValue(ExecState* exec, JSObject* thisObject, JSValue value) { float imp(*static_cast<JSSVGNumber*>(thisObject)->impl()); - imp = value->toFloat(exec); + imp = value.toFloat(exec); static_cast<JSSVGNumber*>(thisObject)->impl()->commitChange(imp, static_cast<JSSVGNumber*>(thisObject)->context()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper<float>* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper<float>* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGNumber, JSSVGPODTypeWrapper<float> >(exec, object, context); } -float toSVGNumber(JSC::JSValuePtr value) +float toSVGNumber(JSC::JSValue value) { - return value->isObject(&JSSVGNumber::s_info) ? (float) *static_cast<JSSVGNumber*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGNumber::s_info) ? (float) *static_cast<JSSVGNumber*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGNumber.h b/src/3rdparty/webkit/WebCore/generated/JSSVGNumber.h index 530c54ad5a..1dead51c02 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGNumber.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGNumber.h @@ -36,13 +36,13 @@ class JSSVGNumber : public DOMObject { public: JSSVGNumber(PassRefPtr<JSC::Structure>, PassRefPtr<JSSVGPODTypeWrapper<float> >, SVGElement* context); virtual ~JSSVGNumber(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -55,12 +55,13 @@ private: RefPtr<JSSVGPODTypeWrapper<float> > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, JSSVGPODTypeWrapper<float>*, SVGElement* context); -float toSVGNumber(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, JSSVGPODTypeWrapper<float>*, SVGElement* context); +float toSVGNumber(JSC::JSValue); class JSSVGNumberPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGNumberPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -68,8 +69,8 @@ public: // Attributes -JSC::JSValuePtr jsSVGNumberValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGNumberValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGNumberValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGNumberValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGNumberList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGNumberList.cpp index b5dfe53c6d..36463c3ef0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGNumberList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGNumberList.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGNumberList) +ASSERT_CLASS_FITS_IN_CELL(JSSVGNumberList); /* Hash table */ @@ -78,9 +78,9 @@ static const HashTable JSSVGNumberListPrototypeTable = const ClassInfo JSSVGNumberListPrototype::s_info = { "SVGNumberListPrototype", 0, &JSSVGNumberListPrototypeTable, 0 }; -JSObject* JSSVGNumberListPrototype::self(ExecState* exec) +JSObject* JSSVGNumberListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGNumberList>(exec); + return getDOMPrototype<JSSVGNumberList>(exec, globalObject); } bool JSSVGNumberListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -100,12 +100,11 @@ JSSVGNumberList::JSSVGNumberList(PassRefPtr<Structure> structure, PassRefPtr<SVG JSSVGNumberList::~JSSVGNumberList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGNumberList::createPrototype(ExecState* exec) +JSObject* JSSVGNumberList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGNumberListPrototype(JSSVGNumberListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGNumberListPrototype(JSSVGNumberListPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGNumberList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -113,15 +112,17 @@ bool JSSVGNumberList::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSSVGNumberList, Base>(exec, &JSSVGNumberListTable, this, propertyName, slot); } -JSValuePtr jsSVGNumberListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGNumberListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGNumberList* imp = static_cast<SVGNumberList*>(static_cast<JSSVGNumberList*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->numberOfItems()); } -JSValuePtr jsSVGNumberListPrototypeFunctionClear(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionClear(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGNumberList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGNumberList::s_info)) return throwError(exec, TypeError); JSSVGNumberList* castedThisObj = static_cast<JSSVGNumberList*>(asObject(thisValue)); SVGNumberList* imp = static_cast<SVGNumberList*>(castedThisObj->impl()); @@ -132,105 +133,111 @@ JSValuePtr jsSVGNumberListPrototypeFunctionClear(ExecState* exec, JSObject*, JSV return jsUndefined(); } -JSValuePtr jsSVGNumberListPrototypeFunctionInitialize(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionInitialize(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGNumberList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGNumberList::s_info)) return throwError(exec, TypeError); JSSVGNumberList* castedThisObj = static_cast<JSSVGNumberList*>(asObject(thisValue)); SVGNumberList* imp = static_cast<SVGNumberList*>(castedThisObj->impl()); ExceptionCode ec = 0; - float item = args.at(exec, 0)->toFloat(exec); + float item = args.at(0).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<float>::create(imp->initialize(item, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<float>::create(imp->initialize(item, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGNumberListPrototypeFunctionGetItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionGetItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGNumberList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGNumberList::s_info)) return throwError(exec, TypeError); JSSVGNumberList* castedThisObj = static_cast<JSSVGNumberList*>(asObject(thisValue)); SVGNumberList* imp = static_cast<SVGNumberList*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<float>::create(imp->getItem(index, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<float>::create(imp->getItem(index, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGNumberListPrototypeFunctionInsertItemBefore(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionInsertItemBefore(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGNumberList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGNumberList::s_info)) return throwError(exec, TypeError); JSSVGNumberList* castedThisObj = static_cast<JSSVGNumberList*>(asObject(thisValue)); SVGNumberList* imp = static_cast<SVGNumberList*>(castedThisObj->impl()); ExceptionCode ec = 0; - float item = args.at(exec, 0)->toFloat(exec); - unsigned index = args.at(exec, 1)->toInt32(exec); + float item = args.at(0).toFloat(exec); + unsigned index = args.at(1).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<float>::create(imp->insertItemBefore(item, index, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<float>::create(imp->insertItemBefore(item, index, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGNumberListPrototypeFunctionReplaceItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionReplaceItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGNumberList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGNumberList::s_info)) return throwError(exec, TypeError); JSSVGNumberList* castedThisObj = static_cast<JSSVGNumberList*>(asObject(thisValue)); SVGNumberList* imp = static_cast<SVGNumberList*>(castedThisObj->impl()); ExceptionCode ec = 0; - float item = args.at(exec, 0)->toFloat(exec); - unsigned index = args.at(exec, 1)->toInt32(exec); + float item = args.at(0).toFloat(exec); + unsigned index = args.at(1).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<float>::create(imp->replaceItem(item, index, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<float>::create(imp->replaceItem(item, index, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGNumberListPrototypeFunctionRemoveItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionRemoveItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGNumberList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGNumberList::s_info)) return throwError(exec, TypeError); JSSVGNumberList* castedThisObj = static_cast<JSSVGNumberList*>(asObject(thisValue)); SVGNumberList* imp = static_cast<SVGNumberList*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<float>::create(imp->removeItem(index, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<float>::create(imp->removeItem(index, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGNumberListPrototypeFunctionAppendItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionAppendItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGNumberList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGNumberList::s_info)) return throwError(exec, TypeError); JSSVGNumberList* castedThisObj = static_cast<JSSVGNumberList*>(asObject(thisValue)); SVGNumberList* imp = static_cast<SVGNumberList*>(castedThisObj->impl()); ExceptionCode ec = 0; - float item = args.at(exec, 0)->toFloat(exec); + float item = args.at(0).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<float>::create(imp->appendItem(item, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<float>::create(imp->appendItem(item, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGNumberList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGNumberList* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGNumberList>(exec, object, context); } -SVGNumberList* toSVGNumberList(JSC::JSValuePtr value) +SVGNumberList* toSVGNumberList(JSC::JSValue value) { - return value->isObject(&JSSVGNumberList::s_info) ? static_cast<JSSVGNumberList*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGNumberList::s_info) ? static_cast<JSSVGNumberList*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGNumberList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGNumberList.h index 64921bf211..584b1bf0f5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGNumberList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGNumberList.h @@ -37,12 +37,12 @@ class JSSVGNumberList : public DOMObject { public: JSSVGNumberList(PassRefPtr<JSC::Structure>, PassRefPtr<SVGNumberList>, SVGElement* context); virtual ~JSSVGNumberList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -55,16 +55,17 @@ private: RefPtr<SVGNumberList > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGNumberList*, SVGElement* context); -SVGNumberList* toSVGNumberList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGNumberList*, SVGElement* context); +SVGNumberList* toSVGNumberList(JSC::JSValue); class JSSVGNumberListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -73,16 +74,16 @@ public: // Functions -JSC::JSValuePtr jsSVGNumberListPrototypeFunctionClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGNumberListPrototypeFunctionInitialize(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGNumberListPrototypeFunctionGetItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGNumberListPrototypeFunctionInsertItemBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGNumberListPrototypeFunctionReplaceItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGNumberListPrototypeFunctionRemoveItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGNumberListPrototypeFunctionAppendItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionInitialize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionGetItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionInsertItemBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionReplaceItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionRemoveItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionAppendItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGNumberListNumberOfItems(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGNumberListNumberOfItems(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPaint.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPaint.cpp index 1baa7164cc..e2d9b35f92 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPaint.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPaint.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPaint) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPaint); /* Hash table */ @@ -87,13 +87,13 @@ public: JSSVGPaintConstructor(ExecState* exec) : DOMObject(JSSVGPaintConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGPaintPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGPaintPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -134,9 +134,9 @@ static const HashTable JSSVGPaintPrototypeTable = const ClassInfo JSSVGPaintPrototype::s_info = { "SVGPaintPrototype", 0, &JSSVGPaintPrototypeTable, 0 }; -JSObject* JSSVGPaintPrototype::self(ExecState* exec) +JSObject* JSSVGPaintPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPaint>(exec); + return getDOMPrototype<JSSVGPaint>(exec, globalObject); } bool JSSVGPaintPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -151,9 +151,9 @@ JSSVGPaint::JSSVGPaint(PassRefPtr<Structure> structure, PassRefPtr<SVGPaint> imp { } -JSObject* JSSVGPaint::createPrototype(ExecState* exec) +JSObject* JSSVGPaint::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPaintPrototype(JSSVGPaintPrototype::createStructure(JSSVGColorPrototype::self(exec))); + return new (exec) JSSVGPaintPrototype(JSSVGPaintPrototype::createStructure(JSSVGColorPrototype::self(exec, globalObject))); } bool JSSVGPaint::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -161,50 +161,54 @@ bool JSSVGPaint::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN return getStaticValueSlot<JSSVGPaint, Base>(exec, &JSSVGPaintTable, this, propertyName, slot); } -JSValuePtr jsSVGPaintPaintType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPaintPaintType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPaint* imp = static_cast<SVGPaint*>(static_cast<JSSVGPaint*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->paintType()); } -JSValuePtr jsSVGPaintUri(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPaintUri(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPaint* imp = static_cast<SVGPaint*>(static_cast<JSSVGPaint*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->uri()); } -JSValuePtr jsSVGPaintConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPaintConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGPaint*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSSVGPaint::getConstructor(ExecState* exec) +JSValue JSSVGPaint::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGPaintConstructor>(exec); } -JSValuePtr jsSVGPaintPrototypeFunctionSetUri(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPaintPrototypeFunctionSetUri(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPaint::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPaint::s_info)) return throwError(exec, TypeError); JSSVGPaint* castedThisObj = static_cast<JSSVGPaint*>(asObject(thisValue)); SVGPaint* imp = static_cast<SVGPaint*>(castedThisObj->impl()); - const UString& uri = args.at(exec, 0)->toString(exec); + const UString& uri = args.at(0).toString(exec); imp->setUri(uri); return jsUndefined(); } -JSValuePtr jsSVGPaintPrototypeFunctionSetPaint(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPaintPrototypeFunctionSetPaint(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPaint::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPaint::s_info)) return throwError(exec, TypeError); JSSVGPaint* castedThisObj = static_cast<JSSVGPaint*>(asObject(thisValue)); SVGPaint* imp = static_cast<SVGPaint*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGPaint::SVGPaintType paintType = static_cast<SVGPaint::SVGPaintType>(args.at(exec, 0)->toInt32(exec)); - const UString& uri = args.at(exec, 1)->toString(exec); - const UString& rgbColor = args.at(exec, 2)->toString(exec); - const UString& iccColor = args.at(exec, 3)->toString(exec); + SVGPaint::SVGPaintType paintType = static_cast<SVGPaint::SVGPaintType>(args.at(0).toInt32(exec)); + const UString& uri = args.at(1).toString(exec); + const UString& rgbColor = args.at(2).toString(exec); + const UString& iccColor = args.at(3).toString(exec); imp->setPaint(paintType, uri, rgbColor, iccColor, ec); setDOMException(exec, ec); @@ -213,52 +217,52 @@ JSValuePtr jsSVGPaintPrototypeFunctionSetPaint(ExecState* exec, JSObject*, JSVal // Constant getters -JSValuePtr jsSVGPaintSVG_PAINTTYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPaintSVG_PAINTTYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGPaintSVG_PAINTTYPE_RGBCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPaintSVG_PAINTTYPE_RGBCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGPaintSVG_PAINTTYPE_RGBCOLOR_ICCCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPaintSVG_PAINTTYPE_RGBCOLOR_ICCCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGPaintSVG_PAINTTYPE_NONE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPaintSVG_PAINTTYPE_NONE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(101)); } -JSValuePtr jsSVGPaintSVG_PAINTTYPE_CURRENTCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPaintSVG_PAINTTYPE_CURRENTCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(102)); } -JSValuePtr jsSVGPaintSVG_PAINTTYPE_URI_NONE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPaintSVG_PAINTTYPE_URI_NONE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(103)); } -JSValuePtr jsSVGPaintSVG_PAINTTYPE_URI_CURRENTCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPaintSVG_PAINTTYPE_URI_CURRENTCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(104)); } -JSValuePtr jsSVGPaintSVG_PAINTTYPE_URI_RGBCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPaintSVG_PAINTTYPE_URI_RGBCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(105)); } -JSValuePtr jsSVGPaintSVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPaintSVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(106)); } -JSValuePtr jsSVGPaintSVG_PAINTTYPE_URI(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPaintSVG_PAINTTYPE_URI(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(107)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPaint.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPaint.h index c5aba40e71..a26f5afcff 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPaint.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPaint.h @@ -34,27 +34,28 @@ class JSSVGPaint : public JSSVGColor { typedef JSSVGColor Base; public: JSSVGPaint(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPaint>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSSVGPaintPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,25 +64,25 @@ public: // Functions -JSC::JSValuePtr jsSVGPaintPrototypeFunctionSetUri(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPaintPrototypeFunctionSetPaint(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPaintPrototypeFunctionSetUri(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPaintPrototypeFunctionSetPaint(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGPaintPaintType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPaintUri(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPaintConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPaintPaintType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPaintUri(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPaintConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGPaintSVG_PAINTTYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPaintSVG_PAINTTYPE_RGBCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPaintSVG_PAINTTYPE_RGBCOLOR_ICCCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPaintSVG_PAINTTYPE_NONE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPaintSVG_PAINTTYPE_CURRENTCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPaintSVG_PAINTTYPE_URI_NONE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPaintSVG_PAINTTYPE_URI_CURRENTCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPaintSVG_PAINTTYPE_URI_RGBCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPaintSVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPaintSVG_PAINTTYPE_URI(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPaintSVG_PAINTTYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPaintSVG_PAINTTYPE_RGBCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPaintSVG_PAINTTYPE_RGBCOLOR_ICCCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPaintSVG_PAINTTYPE_NONE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPaintSVG_PAINTTYPE_CURRENTCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPaintSVG_PAINTTYPE_URI_NONE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPaintSVG_PAINTTYPE_URI_CURRENTCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPaintSVG_PAINTTYPE_URI_RGBCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPaintSVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPaintSVG_PAINTTYPE_URI(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathElement.cpp index 8c0ca0ea55..1cb9d65494 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathElement.cpp @@ -86,7 +86,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathElement); /* Hash table */ @@ -162,9 +162,9 @@ static const HashTable JSSVGPathElementPrototypeTable = const ClassInfo JSSVGPathElementPrototype::s_info = { "SVGPathElementPrototype", 0, &JSSVGPathElementPrototypeTable, 0 }; -JSObject* JSSVGPathElementPrototype::self(ExecState* exec) +JSObject* JSSVGPathElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathElement>(exec); + return getDOMPrototype<JSSVGPathElement>(exec, globalObject); } bool JSSVGPathElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -179,9 +179,9 @@ JSSVGPathElement::JSSVGPathElement(PassRefPtr<Structure> structure, PassRefPtr<S { } -JSObject* JSSVGPathElement::createPrototype(ExecState* exec) +JSObject* JSSVGPathElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathElementPrototype(JSSVGPathElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGPathElementPrototype(JSSVGPathElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGPathElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -189,520 +189,564 @@ bool JSSVGPathElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSSVGPathElement, Base>(exec, &JSSVGPathElementTable, this, propertyName, slot); } -JSValuePtr jsSVGPathElementPathLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathElementPathLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->pathLengthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPathElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGPathElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGPathElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGPathElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGPathElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGPathElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPathElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPathElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGPathElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->transformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPathElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGPathElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -JSValuePtr jsSVGPathElementPathSegList(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathElementPathSegList(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->pathSegList()), imp); } -JSValuePtr jsSVGPathElementNormalizedPathSegList(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathElementNormalizedPathSegList(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->normalizedPathSegList()), imp); } -JSValuePtr jsSVGPathElementAnimatedPathSegList(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathElementAnimatedPathSegList(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->animatedPathSegList()), imp); } -JSValuePtr jsSVGPathElementAnimatedNormalizedPathSegList(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathElementAnimatedNormalizedPathSegList(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->animatedNormalizedPathSegList()), imp); } -void JSSVGPathElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathElement, Base>(exec, propertyName, value, &JSSVGPathElementTable, this, slot); } -void setJSSVGPathElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGPathElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathElement* imp = static_cast<SVGPathElement*>(static_cast<JSSVGPathElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGPathElementPrototypeFunctionGetTotalLength(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetTotalLength(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsNumber(exec, imp->getTotalLength()); + JSC::JSValue result = jsNumber(exec, imp->getTotalLength()); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionGetPointAtLength(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetPointAtLength(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float distance = args.at(exec, 0)->toFloat(exec); + float distance = args.at(0).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatPoint>::create(imp->getPointAtLength(distance)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatPoint>::create(imp->getPointAtLength(distance)).get(), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionGetPathSegAtLength(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetPathSegAtLength(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float distance = args.at(exec, 0)->toFloat(exec); + float distance = args.at(0).toFloat(exec); - JSC::JSValuePtr result = jsNumber(exec, imp->getPathSegAtLength(distance)); + JSC::JSValue result = jsNumber(exec, imp->getPathSegAtLength(distance)); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegClosePath(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegClosePath(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegClosePath()), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegClosePath()), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegMovetoAbs(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegMovetoAbs(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegMovetoAbs(x, y)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegMovetoAbs(x, y)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegMovetoRel(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegMovetoRel(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegMovetoRel(x, y)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegMovetoRel(x, y)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoAbs(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoAbs(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoAbs(x, y)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoAbs(x, y)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoRel(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoRel(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoRel(x, y)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoRel(x, y)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCubicAbs(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCubicAbs(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); - float x1 = args.at(exec, 2)->toFloat(exec); - float y1 = args.at(exec, 3)->toFloat(exec); - float x2 = args.at(exec, 4)->toFloat(exec); - float y2 = args.at(exec, 5)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); + float x1 = args.at(2).toFloat(exec); + float y1 = args.at(3).toFloat(exec); + float x2 = args.at(4).toFloat(exec); + float y2 = args.at(5).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoCubicAbs(x, y, x1, y1, x2, y2)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoCubicAbs(x, y, x1, y1, x2, y2)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCubicRel(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCubicRel(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); - float x1 = args.at(exec, 2)->toFloat(exec); - float y1 = args.at(exec, 3)->toFloat(exec); - float x2 = args.at(exec, 4)->toFloat(exec); - float y2 = args.at(exec, 5)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); + float x1 = args.at(2).toFloat(exec); + float y1 = args.at(3).toFloat(exec); + float x2 = args.at(4).toFloat(exec); + float y2 = args.at(5).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoCubicRel(x, y, x1, y1, x2, y2)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoCubicRel(x, y, x1, y1, x2, y2)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQuadraticAbs(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQuadraticAbs(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); - float x1 = args.at(exec, 2)->toFloat(exec); - float y1 = args.at(exec, 3)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); + float x1 = args.at(2).toFloat(exec); + float y1 = args.at(3).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoQuadraticAbs(x, y, x1, y1)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoQuadraticAbs(x, y, x1, y1)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQuadraticRel(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQuadraticRel(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); - float x1 = args.at(exec, 2)->toFloat(exec); - float y1 = args.at(exec, 3)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); + float x1 = args.at(2).toFloat(exec); + float y1 = args.at(3).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoQuadraticRel(x, y, x1, y1)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoQuadraticRel(x, y, x1, y1)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegArcAbs(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegArcAbs(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); - float r1 = args.at(exec, 2)->toFloat(exec); - float r2 = args.at(exec, 3)->toFloat(exec); - float angle = args.at(exec, 4)->toFloat(exec); - bool largeArcFlag = args.at(exec, 5)->toBoolean(exec); - bool sweepFlag = args.at(exec, 6)->toBoolean(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); + float r1 = args.at(2).toFloat(exec); + float r2 = args.at(3).toFloat(exec); + float angle = args.at(4).toFloat(exec); + bool largeArcFlag = args.at(5).toBoolean(exec); + bool sweepFlag = args.at(6).toBoolean(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegArcAbs(x, y, r1, r2, angle, largeArcFlag, sweepFlag)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegArcAbs(x, y, r1, r2, angle, largeArcFlag, sweepFlag)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegArcRel(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegArcRel(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); - float r1 = args.at(exec, 2)->toFloat(exec); - float r2 = args.at(exec, 3)->toFloat(exec); - float angle = args.at(exec, 4)->toFloat(exec); - bool largeArcFlag = args.at(exec, 5)->toBoolean(exec); - bool sweepFlag = args.at(exec, 6)->toBoolean(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); + float r1 = args.at(2).toFloat(exec); + float r2 = args.at(3).toFloat(exec); + float angle = args.at(4).toFloat(exec); + bool largeArcFlag = args.at(5).toBoolean(exec); + bool sweepFlag = args.at(6).toBoolean(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegArcRel(x, y, r1, r2, angle, largeArcFlag, sweepFlag)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegArcRel(x, y, r1, r2, angle, largeArcFlag, sweepFlag)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoHorizontalAbs(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoHorizontalAbs(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); + float x = args.at(0).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoHorizontalAbs(x)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoHorizontalAbs(x)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoHorizontalRel(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoHorizontalRel(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); + float x = args.at(0).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoHorizontalRel(x)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoHorizontalRel(x)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoVerticalAbs(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoVerticalAbs(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float y = args.at(exec, 0)->toFloat(exec); + float y = args.at(0).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoVerticalAbs(y)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoVerticalAbs(y)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoVerticalRel(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoVerticalRel(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float y = args.at(exec, 0)->toFloat(exec); + float y = args.at(0).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoVerticalRel(y)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoVerticalRel(y)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCubicSmoothAbs(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCubicSmoothAbs(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); - float x2 = args.at(exec, 2)->toFloat(exec); - float y2 = args.at(exec, 3)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); + float x2 = args.at(2).toFloat(exec); + float y2 = args.at(3).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoCubicSmoothAbs(x, y, x2, y2)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoCubicSmoothAbs(x, y, x2, y2)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCubicSmoothRel(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCubicSmoothRel(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); - float x2 = args.at(exec, 2)->toFloat(exec); - float y2 = args.at(exec, 3)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); + float x2 = args.at(2).toFloat(exec); + float y2 = args.at(3).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoCubicSmoothRel(x, y, x2, y2)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoCubicSmoothRel(x, y, x2, y2)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQuadraticSmoothAbs(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQuadraticSmoothAbs(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoQuadraticSmoothAbs(x, y)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoQuadraticSmoothAbs(x, y)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQuadraticSmoothRel(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQuadraticSmoothRel(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - float x = args.at(exec, 0)->toFloat(exec); - float y = args.at(exec, 1)->toFloat(exec); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoQuadraticSmoothRel(x, y)), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoQuadraticSmoothRel(x, y)), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGPathElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathElement::s_info)) return throwError(exec, TypeError); JSSVGPathElement* castedThisObj = static_cast<JSSVGPathElement*>(asObject(thisValue)); SVGPathElement* imp = static_cast<SVGPathElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathElement.h index 2b625a508b..70f154f3ef 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathElement.h @@ -34,13 +34,13 @@ class JSSVGPathElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGPathElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGPathElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,54 +64,54 @@ public: // Functions -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionGetTotalLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionGetPointAtLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionGetPathSegAtLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegClosePath(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegMovetoAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegMovetoRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCubicAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCubicRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQuadraticAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQuadraticRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegArcAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegArcRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoHorizontalAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoHorizontalRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoVerticalAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoVerticalRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCubicSmoothAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCubicSmoothRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQuadraticSmoothAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQuadraticSmoothRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetTotalLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetPointAtLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetPathSegAtLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegClosePath(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegMovetoAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegMovetoRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCubicAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCubicRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQuadraticAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQuadraticRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegArcAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegArcRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoHorizontalAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoHorizontalRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoVerticalAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoVerticalRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCubicSmoothAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCubicSmoothRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQuadraticSmoothAbs(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQuadraticSmoothRel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGPathElementPathLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathElementPathSegList(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathElementNormalizedPathSegList(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathElementAnimatedPathSegList(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathElementAnimatedNormalizedPathSegList(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathElementPathLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathElementPathSegList(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathElementNormalizedPathSegList(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathElementAnimatedPathSegList(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathElementAnimatedNormalizedPathSegList(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSeg.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSeg.cpp index e440877acf..1e601bdd1b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSeg.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSeg.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSeg) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSeg); /* Hash table */ @@ -96,13 +96,13 @@ public: JSSVGPathSegConstructor(ExecState* exec) : DOMObject(JSSVGPathSegConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGPathSegPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGPathSegPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -151,9 +151,9 @@ static const HashTable JSSVGPathSegPrototypeTable = const ClassInfo JSSVGPathSegPrototype::s_info = { "SVGPathSegPrototype", 0, &JSSVGPathSegPrototypeTable, 0 }; -JSObject* JSSVGPathSegPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSeg>(exec); + return getDOMPrototype<JSSVGPathSeg>(exec, globalObject); } bool JSSVGPathSegPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -173,12 +173,11 @@ JSSVGPathSeg::JSSVGPathSeg(PassRefPtr<Structure> structure, PassRefPtr<SVGPathSe JSSVGPathSeg::~JSSVGPathSeg() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGPathSeg::createPrototype(ExecState* exec) +JSObject* JSSVGPathSeg::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegPrototype(JSSVGPathSegPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGPathSegPrototype(JSSVGPathSegPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGPathSeg::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -186,132 +185,134 @@ bool JSSVGPathSeg::getOwnPropertySlot(ExecState* exec, const Identifier& propert return getStaticValueSlot<JSSVGPathSeg, Base>(exec, &JSSVGPathSegTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegPathSegType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegPathSegType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSeg* imp = static_cast<SVGPathSeg*>(static_cast<JSSVGPathSeg*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->pathSegType()); } -JSValuePtr jsSVGPathSegPathSegTypeAsLetter(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegPathSegTypeAsLetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSeg* imp = static_cast<SVGPathSeg*>(static_cast<JSSVGPathSeg*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->pathSegTypeAsLetter()); } -JSValuePtr jsSVGPathSegConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGPathSeg*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSSVGPathSeg::getConstructor(ExecState* exec) +JSValue JSSVGPathSeg::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGPathSegConstructor>(exec); } // Constant getters -JSValuePtr jsSVGPathSegPATHSEG_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGPathSegPATHSEG_CLOSEPATH(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_CLOSEPATH(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGPathSegPATHSEG_MOVETO_ABS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_MOVETO_ABS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGPathSegPATHSEG_MOVETO_REL(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_MOVETO_REL(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsSVGPathSegPATHSEG_LINETO_ABS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_LINETO_ABS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSValuePtr jsSVGPathSegPATHSEG_LINETO_REL(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_LINETO_REL(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(5)); } -JSValuePtr jsSVGPathSegPATHSEG_CURVETO_CUBIC_ABS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_CURVETO_CUBIC_ABS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(6)); } -JSValuePtr jsSVGPathSegPATHSEG_CURVETO_CUBIC_REL(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_CURVETO_CUBIC_REL(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(7)); } -JSValuePtr jsSVGPathSegPATHSEG_CURVETO_QUADRATIC_ABS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_CURVETO_QUADRATIC_ABS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(8)); } -JSValuePtr jsSVGPathSegPATHSEG_CURVETO_QUADRATIC_REL(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_CURVETO_QUADRATIC_REL(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(9)); } -JSValuePtr jsSVGPathSegPATHSEG_ARC_ABS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_ARC_ABS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(10)); } -JSValuePtr jsSVGPathSegPATHSEG_ARC_REL(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_ARC_REL(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(11)); } -JSValuePtr jsSVGPathSegPATHSEG_LINETO_HORIZONTAL_ABS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_LINETO_HORIZONTAL_ABS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(12)); } -JSValuePtr jsSVGPathSegPATHSEG_LINETO_HORIZONTAL_REL(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_LINETO_HORIZONTAL_REL(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(13)); } -JSValuePtr jsSVGPathSegPATHSEG_LINETO_VERTICAL_ABS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_LINETO_VERTICAL_ABS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(14)); } -JSValuePtr jsSVGPathSegPATHSEG_LINETO_VERTICAL_REL(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_LINETO_VERTICAL_REL(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(15)); } -JSValuePtr jsSVGPathSegPATHSEG_CURVETO_CUBIC_SMOOTH_ABS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_CURVETO_CUBIC_SMOOTH_ABS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(16)); } -JSValuePtr jsSVGPathSegPATHSEG_CURVETO_CUBIC_SMOOTH_REL(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_CURVETO_CUBIC_SMOOTH_REL(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(17)); } -JSValuePtr jsSVGPathSegPATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(18)); } -JSValuePtr jsSVGPathSegPATHSEG_CURVETO_QUADRATIC_SMOOTH_REL(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPathSegPATHSEG_CURVETO_QUADRATIC_SMOOTH_REL(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(19)); } -SVGPathSeg* toSVGPathSeg(JSC::JSValuePtr value) +SVGPathSeg* toSVGPathSeg(JSC::JSValue value) { - return value->isObject(&JSSVGPathSeg::s_info) ? static_cast<JSSVGPathSeg*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGPathSeg::s_info) ? static_cast<JSSVGPathSeg*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSeg.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSeg.h index f3795a19e2..f46cfd518e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSeg.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSeg.h @@ -37,17 +37,17 @@ class JSSVGPathSeg : public DOMObject { public: JSSVGPathSeg(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSeg>, SVGElement* context); virtual ~JSSVGPathSeg(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); SVGPathSeg* impl() const { return m_impl.get(); } SVGElement* context() const { return m_context.get(); } @@ -56,16 +56,17 @@ private: RefPtr<SVGPathSeg > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGPathSeg*, SVGElement* context); -SVGPathSeg* toSVGPathSeg(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGPathSeg*, SVGElement* context); +SVGPathSeg* toSVGPathSeg(JSC::JSValue); class JSSVGPathSegPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -74,31 +75,31 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegPathSegType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPathSegTypeAsLetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPathSegType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPathSegTypeAsLetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGPathSegPATHSEG_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_CLOSEPATH(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_MOVETO_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_MOVETO_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_LINETO_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_LINETO_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_CURVETO_CUBIC_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_CURVETO_CUBIC_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_CURVETO_QUADRATIC_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_CURVETO_QUADRATIC_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_ARC_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_ARC_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_LINETO_HORIZONTAL_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_LINETO_HORIZONTAL_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_LINETO_VERTICAL_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_LINETO_VERTICAL_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_CURVETO_CUBIC_SMOOTH_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_CURVETO_CUBIC_SMOOTH_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPathSegPATHSEG_CURVETO_QUADRATIC_SMOOTH_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_CLOSEPATH(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_MOVETO_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_MOVETO_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_LINETO_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_LINETO_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_CURVETO_CUBIC_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_CURVETO_CUBIC_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_CURVETO_QUADRATIC_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_CURVETO_QUADRATIC_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_ARC_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_ARC_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_LINETO_HORIZONTAL_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_LINETO_HORIZONTAL_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_LINETO_VERTICAL_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_LINETO_VERTICAL_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_CURVETO_CUBIC_SMOOTH_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_CURVETO_CUBIC_SMOOTH_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegPATHSEG_CURVETO_QUADRATIC_SMOOTH_REL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcAbs.cpp index 20d0adbb0d..6489794dd0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcAbs.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegArcAbs) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegArcAbs); /* Hash table */ @@ -75,9 +75,9 @@ static const HashTable JSSVGPathSegArcAbsPrototypeTable = const ClassInfo JSSVGPathSegArcAbsPrototype::s_info = { "SVGPathSegArcAbsPrototype", 0, &JSSVGPathSegArcAbsPrototypeTable, 0 }; -JSObject* JSSVGPathSegArcAbsPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegArcAbsPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegArcAbs>(exec); + return getDOMPrototype<JSSVGPathSegArcAbs>(exec, globalObject); } const ClassInfo JSSVGPathSegArcAbs::s_info = { "SVGPathSegArcAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegArcAbsTable, 0 }; @@ -87,9 +87,9 @@ JSSVGPathSegArcAbs::JSSVGPathSegArcAbs(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSSVGPathSegArcAbs::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegArcAbs::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegArcAbsPrototype(JSSVGPathSegArcAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegArcAbsPrototype(JSSVGPathSegArcAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegArcAbs::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -97,105 +97,112 @@ bool JSSVGPathSegArcAbs::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSSVGPathSegArcAbs, Base>(exec, &JSSVGPathSegArcAbsTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegArcAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegArcAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegArcAbs* imp = static_cast<SVGPathSegArcAbs*>(static_cast<JSSVGPathSegArcAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsSVGPathSegArcAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegArcAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegArcAbs* imp = static_cast<SVGPathSegArcAbs*>(static_cast<JSSVGPathSegArcAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -JSValuePtr jsSVGPathSegArcAbsR1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegArcAbsR1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegArcAbs* imp = static_cast<SVGPathSegArcAbs*>(static_cast<JSSVGPathSegArcAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->r1()); } -JSValuePtr jsSVGPathSegArcAbsR2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegArcAbsR2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegArcAbs* imp = static_cast<SVGPathSegArcAbs*>(static_cast<JSSVGPathSegArcAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->r2()); } -JSValuePtr jsSVGPathSegArcAbsAngle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegArcAbsAngle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegArcAbs* imp = static_cast<SVGPathSegArcAbs*>(static_cast<JSSVGPathSegArcAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->angle()); } -JSValuePtr jsSVGPathSegArcAbsLargeArcFlag(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegArcAbsLargeArcFlag(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegArcAbs* imp = static_cast<SVGPathSegArcAbs*>(static_cast<JSSVGPathSegArcAbs*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->largeArcFlag()); } -JSValuePtr jsSVGPathSegArcAbsSweepFlag(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegArcAbsSweepFlag(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegArcAbs* imp = static_cast<SVGPathSegArcAbs*>(static_cast<JSSVGPathSegArcAbs*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->sweepFlag()); } -void JSSVGPathSegArcAbs::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegArcAbs::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegArcAbs, Base>(exec, propertyName, value, &JSSVGPathSegArcAbsTable, this, slot); } -void setJSSVGPathSegArcAbsX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegArcAbsX(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegArcAbs* imp = static_cast<SVGPathSegArcAbs*>(static_cast<JSSVGPathSegArcAbs*>(thisObject)->impl()); - imp->setX(value->toFloat(exec)); + imp->setX(value.toFloat(exec)); if (static_cast<JSSVGPathSegArcAbs*>(thisObject)->context()) static_cast<JSSVGPathSegArcAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegArcAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegArcAbsY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegArcAbsY(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegArcAbs* imp = static_cast<SVGPathSegArcAbs*>(static_cast<JSSVGPathSegArcAbs*>(thisObject)->impl()); - imp->setY(value->toFloat(exec)); + imp->setY(value.toFloat(exec)); if (static_cast<JSSVGPathSegArcAbs*>(thisObject)->context()) static_cast<JSSVGPathSegArcAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegArcAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegArcAbsR1(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegArcAbsR1(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegArcAbs* imp = static_cast<SVGPathSegArcAbs*>(static_cast<JSSVGPathSegArcAbs*>(thisObject)->impl()); - imp->setR1(value->toFloat(exec)); + imp->setR1(value.toFloat(exec)); if (static_cast<JSSVGPathSegArcAbs*>(thisObject)->context()) static_cast<JSSVGPathSegArcAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegArcAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegArcAbsR2(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegArcAbsR2(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegArcAbs* imp = static_cast<SVGPathSegArcAbs*>(static_cast<JSSVGPathSegArcAbs*>(thisObject)->impl()); - imp->setR2(value->toFloat(exec)); + imp->setR2(value.toFloat(exec)); if (static_cast<JSSVGPathSegArcAbs*>(thisObject)->context()) static_cast<JSSVGPathSegArcAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegArcAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegArcAbsAngle(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegArcAbsAngle(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegArcAbs* imp = static_cast<SVGPathSegArcAbs*>(static_cast<JSSVGPathSegArcAbs*>(thisObject)->impl()); - imp->setAngle(value->toFloat(exec)); + imp->setAngle(value.toFloat(exec)); if (static_cast<JSSVGPathSegArcAbs*>(thisObject)->context()) static_cast<JSSVGPathSegArcAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegArcAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegArcAbsLargeArcFlag(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegArcAbsLargeArcFlag(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegArcAbs* imp = static_cast<SVGPathSegArcAbs*>(static_cast<JSSVGPathSegArcAbs*>(thisObject)->impl()); - imp->setLargeArcFlag(value->toBoolean(exec)); + imp->setLargeArcFlag(value.toBoolean(exec)); if (static_cast<JSSVGPathSegArcAbs*>(thisObject)->context()) static_cast<JSSVGPathSegArcAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegArcAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegArcAbsSweepFlag(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegArcAbsSweepFlag(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegArcAbs* imp = static_cast<SVGPathSegArcAbs*>(static_cast<JSSVGPathSegArcAbs*>(thisObject)->impl()); - imp->setSweepFlag(value->toBoolean(exec)); + imp->setSweepFlag(value.toBoolean(exec)); if (static_cast<JSSVGPathSegArcAbs*>(thisObject)->context()) static_cast<JSSVGPathSegArcAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegArcAbs*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcAbs.h index a591fbd15a..dfc2cfad6f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcAbs.h @@ -34,13 +34,13 @@ class JSSVGPathSegArcAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegArcAbs(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegArcAbs>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegArcAbsPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegArcAbsPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,20 +59,20 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegArcAbsX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegArcAbsX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegArcAbsY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegArcAbsY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegArcAbsR1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegArcAbsR1(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegArcAbsR2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegArcAbsR2(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegArcAbsAngle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegArcAbsAngle(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegArcAbsLargeArcFlag(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegArcAbsLargeArcFlag(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegArcAbsSweepFlag(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegArcAbsSweepFlag(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegArcAbsX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegArcAbsX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegArcAbsY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegArcAbsY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegArcAbsR1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegArcAbsR1(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegArcAbsR2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegArcAbsR2(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegArcAbsAngle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegArcAbsAngle(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegArcAbsLargeArcFlag(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegArcAbsLargeArcFlag(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegArcAbsSweepFlag(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegArcAbsSweepFlag(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcRel.cpp index f4f0a80910..daf3bff854 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcRel.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegArcRel) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegArcRel); /* Hash table */ @@ -75,9 +75,9 @@ static const HashTable JSSVGPathSegArcRelPrototypeTable = const ClassInfo JSSVGPathSegArcRelPrototype::s_info = { "SVGPathSegArcRelPrototype", 0, &JSSVGPathSegArcRelPrototypeTable, 0 }; -JSObject* JSSVGPathSegArcRelPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegArcRelPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegArcRel>(exec); + return getDOMPrototype<JSSVGPathSegArcRel>(exec, globalObject); } const ClassInfo JSSVGPathSegArcRel::s_info = { "SVGPathSegArcRel", &JSSVGPathSeg::s_info, &JSSVGPathSegArcRelTable, 0 }; @@ -87,9 +87,9 @@ JSSVGPathSegArcRel::JSSVGPathSegArcRel(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSSVGPathSegArcRel::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegArcRel::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegArcRelPrototype(JSSVGPathSegArcRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegArcRelPrototype(JSSVGPathSegArcRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegArcRel::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -97,105 +97,112 @@ bool JSSVGPathSegArcRel::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSSVGPathSegArcRel, Base>(exec, &JSSVGPathSegArcRelTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegArcRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegArcRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegArcRel* imp = static_cast<SVGPathSegArcRel*>(static_cast<JSSVGPathSegArcRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsSVGPathSegArcRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegArcRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegArcRel* imp = static_cast<SVGPathSegArcRel*>(static_cast<JSSVGPathSegArcRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -JSValuePtr jsSVGPathSegArcRelR1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegArcRelR1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegArcRel* imp = static_cast<SVGPathSegArcRel*>(static_cast<JSSVGPathSegArcRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->r1()); } -JSValuePtr jsSVGPathSegArcRelR2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegArcRelR2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegArcRel* imp = static_cast<SVGPathSegArcRel*>(static_cast<JSSVGPathSegArcRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->r2()); } -JSValuePtr jsSVGPathSegArcRelAngle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegArcRelAngle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegArcRel* imp = static_cast<SVGPathSegArcRel*>(static_cast<JSSVGPathSegArcRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->angle()); } -JSValuePtr jsSVGPathSegArcRelLargeArcFlag(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegArcRelLargeArcFlag(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegArcRel* imp = static_cast<SVGPathSegArcRel*>(static_cast<JSSVGPathSegArcRel*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->largeArcFlag()); } -JSValuePtr jsSVGPathSegArcRelSweepFlag(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegArcRelSweepFlag(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegArcRel* imp = static_cast<SVGPathSegArcRel*>(static_cast<JSSVGPathSegArcRel*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->sweepFlag()); } -void JSSVGPathSegArcRel::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegArcRel::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegArcRel, Base>(exec, propertyName, value, &JSSVGPathSegArcRelTable, this, slot); } -void setJSSVGPathSegArcRelX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegArcRelX(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegArcRel* imp = static_cast<SVGPathSegArcRel*>(static_cast<JSSVGPathSegArcRel*>(thisObject)->impl()); - imp->setX(value->toFloat(exec)); + imp->setX(value.toFloat(exec)); if (static_cast<JSSVGPathSegArcRel*>(thisObject)->context()) static_cast<JSSVGPathSegArcRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegArcRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegArcRelY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegArcRelY(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegArcRel* imp = static_cast<SVGPathSegArcRel*>(static_cast<JSSVGPathSegArcRel*>(thisObject)->impl()); - imp->setY(value->toFloat(exec)); + imp->setY(value.toFloat(exec)); if (static_cast<JSSVGPathSegArcRel*>(thisObject)->context()) static_cast<JSSVGPathSegArcRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegArcRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegArcRelR1(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegArcRelR1(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegArcRel* imp = static_cast<SVGPathSegArcRel*>(static_cast<JSSVGPathSegArcRel*>(thisObject)->impl()); - imp->setR1(value->toFloat(exec)); + imp->setR1(value.toFloat(exec)); if (static_cast<JSSVGPathSegArcRel*>(thisObject)->context()) static_cast<JSSVGPathSegArcRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegArcRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegArcRelR2(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegArcRelR2(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegArcRel* imp = static_cast<SVGPathSegArcRel*>(static_cast<JSSVGPathSegArcRel*>(thisObject)->impl()); - imp->setR2(value->toFloat(exec)); + imp->setR2(value.toFloat(exec)); if (static_cast<JSSVGPathSegArcRel*>(thisObject)->context()) static_cast<JSSVGPathSegArcRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegArcRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegArcRelAngle(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegArcRelAngle(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegArcRel* imp = static_cast<SVGPathSegArcRel*>(static_cast<JSSVGPathSegArcRel*>(thisObject)->impl()); - imp->setAngle(value->toFloat(exec)); + imp->setAngle(value.toFloat(exec)); if (static_cast<JSSVGPathSegArcRel*>(thisObject)->context()) static_cast<JSSVGPathSegArcRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegArcRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegArcRelLargeArcFlag(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegArcRelLargeArcFlag(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegArcRel* imp = static_cast<SVGPathSegArcRel*>(static_cast<JSSVGPathSegArcRel*>(thisObject)->impl()); - imp->setLargeArcFlag(value->toBoolean(exec)); + imp->setLargeArcFlag(value.toBoolean(exec)); if (static_cast<JSSVGPathSegArcRel*>(thisObject)->context()) static_cast<JSSVGPathSegArcRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegArcRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegArcRelSweepFlag(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegArcRelSweepFlag(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegArcRel* imp = static_cast<SVGPathSegArcRel*>(static_cast<JSSVGPathSegArcRel*>(thisObject)->impl()); - imp->setSweepFlag(value->toBoolean(exec)); + imp->setSweepFlag(value.toBoolean(exec)); if (static_cast<JSSVGPathSegArcRel*>(thisObject)->context()) static_cast<JSSVGPathSegArcRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegArcRel*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcRel.h index b395fa3aad..55993a04d7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcRel.h @@ -34,13 +34,13 @@ class JSSVGPathSegArcRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegArcRel(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegArcRel>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegArcRelPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegArcRelPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,20 +59,20 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegArcRelX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegArcRelX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegArcRelY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegArcRelY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegArcRelR1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegArcRelR1(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegArcRelR2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegArcRelR2(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegArcRelAngle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegArcRelAngle(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegArcRelLargeArcFlag(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegArcRelLargeArcFlag(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegArcRelSweepFlag(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegArcRelSweepFlag(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegArcRelX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegArcRelX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegArcRelY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegArcRelY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegArcRelR1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegArcRelR1(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegArcRelR2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegArcRelR2(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegArcRelAngle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegArcRelAngle(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegArcRelLargeArcFlag(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegArcRelLargeArcFlag(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegArcRelSweepFlag(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegArcRelSweepFlag(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegClosePath.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegClosePath.cpp index e44bd52d2d..7952c2d2ab 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegClosePath.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegClosePath.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegClosePath) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegClosePath); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGPathSegClosePathPrototypeTable = const ClassInfo JSSVGPathSegClosePathPrototype::s_info = { "SVGPathSegClosePathPrototype", 0, &JSSVGPathSegClosePathPrototypeTable, 0 }; -JSObject* JSSVGPathSegClosePathPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegClosePathPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegClosePath>(exec); + return getDOMPrototype<JSSVGPathSegClosePath>(exec, globalObject); } const ClassInfo JSSVGPathSegClosePath::s_info = { "SVGPathSegClosePath", &JSSVGPathSeg::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGPathSegClosePath::JSSVGPathSegClosePath(PassRefPtr<Structure> structure, Pa { } -JSObject* JSSVGPathSegClosePath::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegClosePath::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegClosePathPrototype(JSSVGPathSegClosePathPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegClosePathPrototype(JSSVGPathSegClosePathPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegClosePath.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegClosePath.h index a3ceb9092e..d5827bbedc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegClosePath.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegClosePath.h @@ -34,7 +34,7 @@ class JSSVGPathSegClosePath : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegClosePath(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegClosePath>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGPathSegClosePathPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegClosePathPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicAbs.cpp index f121cd16e7..2763388ab0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicAbs.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegCurvetoCubicAbs) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegCurvetoCubicAbs); /* Hash table */ @@ -74,9 +74,9 @@ static const HashTable JSSVGPathSegCurvetoCubicAbsPrototypeTable = const ClassInfo JSSVGPathSegCurvetoCubicAbsPrototype::s_info = { "SVGPathSegCurvetoCubicAbsPrototype", 0, &JSSVGPathSegCurvetoCubicAbsPrototypeTable, 0 }; -JSObject* JSSVGPathSegCurvetoCubicAbsPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegCurvetoCubicAbsPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegCurvetoCubicAbs>(exec); + return getDOMPrototype<JSSVGPathSegCurvetoCubicAbs>(exec, globalObject); } const ClassInfo JSSVGPathSegCurvetoCubicAbs::s_info = { "SVGPathSegCurvetoCubicAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegCurvetoCubicAbsTable, 0 }; @@ -86,9 +86,9 @@ JSSVGPathSegCurvetoCubicAbs::JSSVGPathSegCurvetoCubicAbs(PassRefPtr<Structure> s { } -JSObject* JSSVGPathSegCurvetoCubicAbs::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegCurvetoCubicAbs::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegCurvetoCubicAbsPrototype(JSSVGPathSegCurvetoCubicAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegCurvetoCubicAbsPrototype(JSSVGPathSegCurvetoCubicAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegCurvetoCubicAbs::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -96,91 +96,97 @@ bool JSSVGPathSegCurvetoCubicAbs::getOwnPropertySlot(ExecState* exec, const Iden return getStaticValueSlot<JSSVGPathSegCurvetoCubicAbs, Base>(exec, &JSSVGPathSegCurvetoCubicAbsTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegCurvetoCubicAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicAbs* imp = static_cast<SVGPathSegCurvetoCubicAbs*>(static_cast<JSSVGPathSegCurvetoCubicAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsSVGPathSegCurvetoCubicAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicAbs* imp = static_cast<SVGPathSegCurvetoCubicAbs*>(static_cast<JSSVGPathSegCurvetoCubicAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -JSValuePtr jsSVGPathSegCurvetoCubicAbsX1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicAbsX1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicAbs* imp = static_cast<SVGPathSegCurvetoCubicAbs*>(static_cast<JSSVGPathSegCurvetoCubicAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x1()); } -JSValuePtr jsSVGPathSegCurvetoCubicAbsY1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicAbsY1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicAbs* imp = static_cast<SVGPathSegCurvetoCubicAbs*>(static_cast<JSSVGPathSegCurvetoCubicAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y1()); } -JSValuePtr jsSVGPathSegCurvetoCubicAbsX2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicAbsX2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicAbs* imp = static_cast<SVGPathSegCurvetoCubicAbs*>(static_cast<JSSVGPathSegCurvetoCubicAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x2()); } -JSValuePtr jsSVGPathSegCurvetoCubicAbsY2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicAbsY2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicAbs* imp = static_cast<SVGPathSegCurvetoCubicAbs*>(static_cast<JSSVGPathSegCurvetoCubicAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y2()); } -void JSSVGPathSegCurvetoCubicAbs::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegCurvetoCubicAbs::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegCurvetoCubicAbs, Base>(exec, propertyName, value, &JSSVGPathSegCurvetoCubicAbsTable, this, slot); } -void setJSSVGPathSegCurvetoCubicAbsX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicAbsX(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicAbs* imp = static_cast<SVGPathSegCurvetoCubicAbs*>(static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->impl()); - imp->setX(value->toFloat(exec)); + imp->setX(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoCubicAbsY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicAbsY(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicAbs* imp = static_cast<SVGPathSegCurvetoCubicAbs*>(static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->impl()); - imp->setY(value->toFloat(exec)); + imp->setY(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoCubicAbsX1(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicAbsX1(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicAbs* imp = static_cast<SVGPathSegCurvetoCubicAbs*>(static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->impl()); - imp->setX1(value->toFloat(exec)); + imp->setX1(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoCubicAbsY1(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicAbsY1(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicAbs* imp = static_cast<SVGPathSegCurvetoCubicAbs*>(static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->impl()); - imp->setY1(value->toFloat(exec)); + imp->setY1(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoCubicAbsX2(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicAbsX2(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicAbs* imp = static_cast<SVGPathSegCurvetoCubicAbs*>(static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->impl()); - imp->setX2(value->toFloat(exec)); + imp->setX2(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoCubicAbsY2(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicAbsY2(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicAbs* imp = static_cast<SVGPathSegCurvetoCubicAbs*>(static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->impl()); - imp->setY2(value->toFloat(exec)); + imp->setY2(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicAbs*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicAbs.h index 2d0324d174..715a0f42f7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicAbs.h @@ -34,13 +34,13 @@ class JSSVGPathSegCurvetoCubicAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegCurvetoCubicAbs(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegCurvetoCubicAbs>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegCurvetoCubicAbsPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegCurvetoCubicAbsPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,18 +59,18 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegCurvetoCubicAbsX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicAbsX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoCubicAbsY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicAbsY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoCubicAbsX1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicAbsX1(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoCubicAbsY1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicAbsY1(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoCubicAbsX2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicAbsX2(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoCubicAbsY2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicAbsY2(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegCurvetoCubicAbsX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicAbsX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoCubicAbsY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicAbsY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoCubicAbsX1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicAbsX1(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoCubicAbsY1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicAbsY1(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoCubicAbsX2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicAbsX2(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoCubicAbsY2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicAbsY2(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicRel.cpp index 0d917ec038..4a554665a4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicRel.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegCurvetoCubicRel) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegCurvetoCubicRel); /* Hash table */ @@ -74,9 +74,9 @@ static const HashTable JSSVGPathSegCurvetoCubicRelPrototypeTable = const ClassInfo JSSVGPathSegCurvetoCubicRelPrototype::s_info = { "SVGPathSegCurvetoCubicRelPrototype", 0, &JSSVGPathSegCurvetoCubicRelPrototypeTable, 0 }; -JSObject* JSSVGPathSegCurvetoCubicRelPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegCurvetoCubicRelPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegCurvetoCubicRel>(exec); + return getDOMPrototype<JSSVGPathSegCurvetoCubicRel>(exec, globalObject); } const ClassInfo JSSVGPathSegCurvetoCubicRel::s_info = { "SVGPathSegCurvetoCubicRel", &JSSVGPathSeg::s_info, &JSSVGPathSegCurvetoCubicRelTable, 0 }; @@ -86,9 +86,9 @@ JSSVGPathSegCurvetoCubicRel::JSSVGPathSegCurvetoCubicRel(PassRefPtr<Structure> s { } -JSObject* JSSVGPathSegCurvetoCubicRel::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegCurvetoCubicRel::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegCurvetoCubicRelPrototype(JSSVGPathSegCurvetoCubicRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegCurvetoCubicRelPrototype(JSSVGPathSegCurvetoCubicRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegCurvetoCubicRel::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -96,91 +96,97 @@ bool JSSVGPathSegCurvetoCubicRel::getOwnPropertySlot(ExecState* exec, const Iden return getStaticValueSlot<JSSVGPathSegCurvetoCubicRel, Base>(exec, &JSSVGPathSegCurvetoCubicRelTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegCurvetoCubicRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicRel* imp = static_cast<SVGPathSegCurvetoCubicRel*>(static_cast<JSSVGPathSegCurvetoCubicRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsSVGPathSegCurvetoCubicRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicRel* imp = static_cast<SVGPathSegCurvetoCubicRel*>(static_cast<JSSVGPathSegCurvetoCubicRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -JSValuePtr jsSVGPathSegCurvetoCubicRelX1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicRelX1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicRel* imp = static_cast<SVGPathSegCurvetoCubicRel*>(static_cast<JSSVGPathSegCurvetoCubicRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x1()); } -JSValuePtr jsSVGPathSegCurvetoCubicRelY1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicRelY1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicRel* imp = static_cast<SVGPathSegCurvetoCubicRel*>(static_cast<JSSVGPathSegCurvetoCubicRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y1()); } -JSValuePtr jsSVGPathSegCurvetoCubicRelX2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicRelX2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicRel* imp = static_cast<SVGPathSegCurvetoCubicRel*>(static_cast<JSSVGPathSegCurvetoCubicRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x2()); } -JSValuePtr jsSVGPathSegCurvetoCubicRelY2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicRelY2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicRel* imp = static_cast<SVGPathSegCurvetoCubicRel*>(static_cast<JSSVGPathSegCurvetoCubicRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y2()); } -void JSSVGPathSegCurvetoCubicRel::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegCurvetoCubicRel::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegCurvetoCubicRel, Base>(exec, propertyName, value, &JSSVGPathSegCurvetoCubicRelTable, this, slot); } -void setJSSVGPathSegCurvetoCubicRelX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicRelX(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicRel* imp = static_cast<SVGPathSegCurvetoCubicRel*>(static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->impl()); - imp->setX(value->toFloat(exec)); + imp->setX(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoCubicRelY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicRelY(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicRel* imp = static_cast<SVGPathSegCurvetoCubicRel*>(static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->impl()); - imp->setY(value->toFloat(exec)); + imp->setY(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoCubicRelX1(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicRelX1(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicRel* imp = static_cast<SVGPathSegCurvetoCubicRel*>(static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->impl()); - imp->setX1(value->toFloat(exec)); + imp->setX1(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoCubicRelY1(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicRelY1(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicRel* imp = static_cast<SVGPathSegCurvetoCubicRel*>(static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->impl()); - imp->setY1(value->toFloat(exec)); + imp->setY1(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoCubicRelX2(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicRelX2(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicRel* imp = static_cast<SVGPathSegCurvetoCubicRel*>(static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->impl()); - imp->setX2(value->toFloat(exec)); + imp->setX2(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoCubicRelY2(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicRelY2(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicRel* imp = static_cast<SVGPathSegCurvetoCubicRel*>(static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->impl()); - imp->setY2(value->toFloat(exec)); + imp->setY2(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicRel*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicRel.h index 65d891fd31..7738af3aa7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicRel.h @@ -34,13 +34,13 @@ class JSSVGPathSegCurvetoCubicRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegCurvetoCubicRel(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegCurvetoCubicRel>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegCurvetoCubicRelPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegCurvetoCubicRelPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,18 +59,18 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegCurvetoCubicRelX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicRelX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoCubicRelY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicRelY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoCubicRelX1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicRelX1(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoCubicRelY1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicRelY1(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoCubicRelX2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicRelX2(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoCubicRelY2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicRelY2(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegCurvetoCubicRelX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicRelX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoCubicRelY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicRelY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoCubicRelX1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicRelX1(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoCubicRelY1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicRelY1(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoCubicRelX2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicRelX2(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoCubicRelY2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicRelY2(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothAbs.cpp index 6c0367fc8f..9b3bbaccbc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothAbs.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegCurvetoCubicSmoothAbs) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegCurvetoCubicSmoothAbs); /* Hash table */ @@ -72,9 +72,9 @@ static const HashTable JSSVGPathSegCurvetoCubicSmoothAbsPrototypeTable = const ClassInfo JSSVGPathSegCurvetoCubicSmoothAbsPrototype::s_info = { "SVGPathSegCurvetoCubicSmoothAbsPrototype", 0, &JSSVGPathSegCurvetoCubicSmoothAbsPrototypeTable, 0 }; -JSObject* JSSVGPathSegCurvetoCubicSmoothAbsPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegCurvetoCubicSmoothAbsPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegCurvetoCubicSmoothAbs>(exec); + return getDOMPrototype<JSSVGPathSegCurvetoCubicSmoothAbs>(exec, globalObject); } const ClassInfo JSSVGPathSegCurvetoCubicSmoothAbs::s_info = { "SVGPathSegCurvetoCubicSmoothAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegCurvetoCubicSmoothAbsTable, 0 }; @@ -84,9 +84,9 @@ JSSVGPathSegCurvetoCubicSmoothAbs::JSSVGPathSegCurvetoCubicSmoothAbs(PassRefPtr< { } -JSObject* JSSVGPathSegCurvetoCubicSmoothAbs::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegCurvetoCubicSmoothAbs::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegCurvetoCubicSmoothAbsPrototype(JSSVGPathSegCurvetoCubicSmoothAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegCurvetoCubicSmoothAbsPrototype(JSSVGPathSegCurvetoCubicSmoothAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegCurvetoCubicSmoothAbs::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -94,63 +94,67 @@ bool JSSVGPathSegCurvetoCubicSmoothAbs::getOwnPropertySlot(ExecState* exec, cons return getStaticValueSlot<JSSVGPathSegCurvetoCubicSmoothAbs, Base>(exec, &JSSVGPathSegCurvetoCubicSmoothAbsTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegCurvetoCubicSmoothAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicSmoothAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicSmoothAbs* imp = static_cast<SVGPathSegCurvetoCubicSmoothAbs*>(static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsSVGPathSegCurvetoCubicSmoothAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicSmoothAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicSmoothAbs* imp = static_cast<SVGPathSegCurvetoCubicSmoothAbs*>(static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -JSValuePtr jsSVGPathSegCurvetoCubicSmoothAbsX2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicSmoothAbsX2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicSmoothAbs* imp = static_cast<SVGPathSegCurvetoCubicSmoothAbs*>(static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x2()); } -JSValuePtr jsSVGPathSegCurvetoCubicSmoothAbsY2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicSmoothAbsY2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicSmoothAbs* imp = static_cast<SVGPathSegCurvetoCubicSmoothAbs*>(static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y2()); } -void JSSVGPathSegCurvetoCubicSmoothAbs::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegCurvetoCubicSmoothAbs::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegCurvetoCubicSmoothAbs, Base>(exec, propertyName, value, &JSSVGPathSegCurvetoCubicSmoothAbsTable, this, slot); } -void setJSSVGPathSegCurvetoCubicSmoothAbsX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicSmoothAbsX(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicSmoothAbs* imp = static_cast<SVGPathSegCurvetoCubicSmoothAbs*>(static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(thisObject)->impl()); - imp->setX(value->toFloat(exec)); + imp->setX(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoCubicSmoothAbsY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicSmoothAbsY(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicSmoothAbs* imp = static_cast<SVGPathSegCurvetoCubicSmoothAbs*>(static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(thisObject)->impl()); - imp->setY(value->toFloat(exec)); + imp->setY(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoCubicSmoothAbsX2(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicSmoothAbsX2(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicSmoothAbs* imp = static_cast<SVGPathSegCurvetoCubicSmoothAbs*>(static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(thisObject)->impl()); - imp->setX2(value->toFloat(exec)); + imp->setX2(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoCubicSmoothAbsY2(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicSmoothAbsY2(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicSmoothAbs* imp = static_cast<SVGPathSegCurvetoCubicSmoothAbs*>(static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(thisObject)->impl()); - imp->setY2(value->toFloat(exec)); + imp->setY2(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicSmoothAbs*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothAbs.h index a85e616877..178a4365ef 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothAbs.h @@ -34,13 +34,13 @@ class JSSVGPathSegCurvetoCubicSmoothAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegCurvetoCubicSmoothAbs(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegCurvetoCubicSmoothAbs>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegCurvetoCubicSmoothAbsPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegCurvetoCubicSmoothAbsPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,14 +59,14 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegCurvetoCubicSmoothAbsX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicSmoothAbsX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoCubicSmoothAbsY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicSmoothAbsY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoCubicSmoothAbsX2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicSmoothAbsX2(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoCubicSmoothAbsY2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicSmoothAbsY2(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegCurvetoCubicSmoothAbsX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicSmoothAbsX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoCubicSmoothAbsY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicSmoothAbsY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoCubicSmoothAbsX2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicSmoothAbsX2(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoCubicSmoothAbsY2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicSmoothAbsY2(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothRel.cpp index 6f98a57057..a7f132ceef 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothRel.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegCurvetoCubicSmoothRel) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegCurvetoCubicSmoothRel); /* Hash table */ @@ -72,9 +72,9 @@ static const HashTable JSSVGPathSegCurvetoCubicSmoothRelPrototypeTable = const ClassInfo JSSVGPathSegCurvetoCubicSmoothRelPrototype::s_info = { "SVGPathSegCurvetoCubicSmoothRelPrototype", 0, &JSSVGPathSegCurvetoCubicSmoothRelPrototypeTable, 0 }; -JSObject* JSSVGPathSegCurvetoCubicSmoothRelPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegCurvetoCubicSmoothRelPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegCurvetoCubicSmoothRel>(exec); + return getDOMPrototype<JSSVGPathSegCurvetoCubicSmoothRel>(exec, globalObject); } const ClassInfo JSSVGPathSegCurvetoCubicSmoothRel::s_info = { "SVGPathSegCurvetoCubicSmoothRel", &JSSVGPathSeg::s_info, &JSSVGPathSegCurvetoCubicSmoothRelTable, 0 }; @@ -84,9 +84,9 @@ JSSVGPathSegCurvetoCubicSmoothRel::JSSVGPathSegCurvetoCubicSmoothRel(PassRefPtr< { } -JSObject* JSSVGPathSegCurvetoCubicSmoothRel::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegCurvetoCubicSmoothRel::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegCurvetoCubicSmoothRelPrototype(JSSVGPathSegCurvetoCubicSmoothRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegCurvetoCubicSmoothRelPrototype(JSSVGPathSegCurvetoCubicSmoothRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegCurvetoCubicSmoothRel::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -94,63 +94,67 @@ bool JSSVGPathSegCurvetoCubicSmoothRel::getOwnPropertySlot(ExecState* exec, cons return getStaticValueSlot<JSSVGPathSegCurvetoCubicSmoothRel, Base>(exec, &JSSVGPathSegCurvetoCubicSmoothRelTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegCurvetoCubicSmoothRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicSmoothRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicSmoothRel* imp = static_cast<SVGPathSegCurvetoCubicSmoothRel*>(static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsSVGPathSegCurvetoCubicSmoothRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicSmoothRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicSmoothRel* imp = static_cast<SVGPathSegCurvetoCubicSmoothRel*>(static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -JSValuePtr jsSVGPathSegCurvetoCubicSmoothRelX2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicSmoothRelX2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicSmoothRel* imp = static_cast<SVGPathSegCurvetoCubicSmoothRel*>(static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x2()); } -JSValuePtr jsSVGPathSegCurvetoCubicSmoothRelY2(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoCubicSmoothRelY2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoCubicSmoothRel* imp = static_cast<SVGPathSegCurvetoCubicSmoothRel*>(static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y2()); } -void JSSVGPathSegCurvetoCubicSmoothRel::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegCurvetoCubicSmoothRel::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegCurvetoCubicSmoothRel, Base>(exec, propertyName, value, &JSSVGPathSegCurvetoCubicSmoothRelTable, this, slot); } -void setJSSVGPathSegCurvetoCubicSmoothRelX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicSmoothRelX(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicSmoothRel* imp = static_cast<SVGPathSegCurvetoCubicSmoothRel*>(static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(thisObject)->impl()); - imp->setX(value->toFloat(exec)); + imp->setX(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoCubicSmoothRelY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicSmoothRelY(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicSmoothRel* imp = static_cast<SVGPathSegCurvetoCubicSmoothRel*>(static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(thisObject)->impl()); - imp->setY(value->toFloat(exec)); + imp->setY(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoCubicSmoothRelX2(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicSmoothRelX2(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicSmoothRel* imp = static_cast<SVGPathSegCurvetoCubicSmoothRel*>(static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(thisObject)->impl()); - imp->setX2(value->toFloat(exec)); + imp->setX2(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoCubicSmoothRelY2(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoCubicSmoothRelY2(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoCubicSmoothRel* imp = static_cast<SVGPathSegCurvetoCubicSmoothRel*>(static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(thisObject)->impl()); - imp->setY2(value->toFloat(exec)); + imp->setY2(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoCubicSmoothRel*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothRel.h index f05dd7a658..b1d41ea5ef 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothRel.h @@ -34,13 +34,13 @@ class JSSVGPathSegCurvetoCubicSmoothRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegCurvetoCubicSmoothRel(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegCurvetoCubicSmoothRel>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegCurvetoCubicSmoothRelPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegCurvetoCubicSmoothRelPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,14 +59,14 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegCurvetoCubicSmoothRelX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicSmoothRelX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoCubicSmoothRelY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicSmoothRelY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoCubicSmoothRelX2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicSmoothRelX2(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoCubicSmoothRelY2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoCubicSmoothRelY2(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegCurvetoCubicSmoothRelX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicSmoothRelX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoCubicSmoothRelY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicSmoothRelY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoCubicSmoothRelX2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicSmoothRelX2(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoCubicSmoothRelY2(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoCubicSmoothRelY2(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticAbs.cpp index c4d685f5fb..9c6915119e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticAbs.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegCurvetoQuadraticAbs) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegCurvetoQuadraticAbs); /* Hash table */ @@ -72,9 +72,9 @@ static const HashTable JSSVGPathSegCurvetoQuadraticAbsPrototypeTable = const ClassInfo JSSVGPathSegCurvetoQuadraticAbsPrototype::s_info = { "SVGPathSegCurvetoQuadraticAbsPrototype", 0, &JSSVGPathSegCurvetoQuadraticAbsPrototypeTable, 0 }; -JSObject* JSSVGPathSegCurvetoQuadraticAbsPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegCurvetoQuadraticAbsPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegCurvetoQuadraticAbs>(exec); + return getDOMPrototype<JSSVGPathSegCurvetoQuadraticAbs>(exec, globalObject); } const ClassInfo JSSVGPathSegCurvetoQuadraticAbs::s_info = { "SVGPathSegCurvetoQuadraticAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegCurvetoQuadraticAbsTable, 0 }; @@ -84,9 +84,9 @@ JSSVGPathSegCurvetoQuadraticAbs::JSSVGPathSegCurvetoQuadraticAbs(PassRefPtr<Stru { } -JSObject* JSSVGPathSegCurvetoQuadraticAbs::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegCurvetoQuadraticAbs::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegCurvetoQuadraticAbsPrototype(JSSVGPathSegCurvetoQuadraticAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegCurvetoQuadraticAbsPrototype(JSSVGPathSegCurvetoQuadraticAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegCurvetoQuadraticAbs::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -94,63 +94,67 @@ bool JSSVGPathSegCurvetoQuadraticAbs::getOwnPropertySlot(ExecState* exec, const return getStaticValueSlot<JSSVGPathSegCurvetoQuadraticAbs, Base>(exec, &JSSVGPathSegCurvetoQuadraticAbsTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegCurvetoQuadraticAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoQuadraticAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoQuadraticAbs* imp = static_cast<SVGPathSegCurvetoQuadraticAbs*>(static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsSVGPathSegCurvetoQuadraticAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoQuadraticAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoQuadraticAbs* imp = static_cast<SVGPathSegCurvetoQuadraticAbs*>(static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -JSValuePtr jsSVGPathSegCurvetoQuadraticAbsX1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoQuadraticAbsX1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoQuadraticAbs* imp = static_cast<SVGPathSegCurvetoQuadraticAbs*>(static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x1()); } -JSValuePtr jsSVGPathSegCurvetoQuadraticAbsY1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoQuadraticAbsY1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoQuadraticAbs* imp = static_cast<SVGPathSegCurvetoQuadraticAbs*>(static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y1()); } -void JSSVGPathSegCurvetoQuadraticAbs::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegCurvetoQuadraticAbs::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegCurvetoQuadraticAbs, Base>(exec, propertyName, value, &JSSVGPathSegCurvetoQuadraticAbsTable, this, slot); } -void setJSSVGPathSegCurvetoQuadraticAbsX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoQuadraticAbsX(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoQuadraticAbs* imp = static_cast<SVGPathSegCurvetoQuadraticAbs*>(static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(thisObject)->impl()); - imp->setX(value->toFloat(exec)); + imp->setX(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoQuadraticAbsY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoQuadraticAbsY(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoQuadraticAbs* imp = static_cast<SVGPathSegCurvetoQuadraticAbs*>(static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(thisObject)->impl()); - imp->setY(value->toFloat(exec)); + imp->setY(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoQuadraticAbsX1(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoQuadraticAbsX1(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoQuadraticAbs* imp = static_cast<SVGPathSegCurvetoQuadraticAbs*>(static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(thisObject)->impl()); - imp->setX1(value->toFloat(exec)); + imp->setX1(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoQuadraticAbsY1(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoQuadraticAbsY1(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoQuadraticAbs* imp = static_cast<SVGPathSegCurvetoQuadraticAbs*>(static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(thisObject)->impl()); - imp->setY1(value->toFloat(exec)); + imp->setY1(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoQuadraticAbs*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticAbs.h index b07efa5454..f128df59de 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticAbs.h @@ -34,13 +34,13 @@ class JSSVGPathSegCurvetoQuadraticAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegCurvetoQuadraticAbs(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegCurvetoQuadraticAbs>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegCurvetoQuadraticAbsPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegCurvetoQuadraticAbsPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,14 +59,14 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegCurvetoQuadraticAbsX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoQuadraticAbsX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoQuadraticAbsY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoQuadraticAbsY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoQuadraticAbsX1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoQuadraticAbsX1(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoQuadraticAbsY1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoQuadraticAbsY1(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegCurvetoQuadraticAbsX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoQuadraticAbsX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoQuadraticAbsY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoQuadraticAbsY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoQuadraticAbsX1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoQuadraticAbsX1(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoQuadraticAbsY1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoQuadraticAbsY1(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticRel.cpp index 98040c3b0a..7bd921d4fe 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticRel.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegCurvetoQuadraticRel) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegCurvetoQuadraticRel); /* Hash table */ @@ -72,9 +72,9 @@ static const HashTable JSSVGPathSegCurvetoQuadraticRelPrototypeTable = const ClassInfo JSSVGPathSegCurvetoQuadraticRelPrototype::s_info = { "SVGPathSegCurvetoQuadraticRelPrototype", 0, &JSSVGPathSegCurvetoQuadraticRelPrototypeTable, 0 }; -JSObject* JSSVGPathSegCurvetoQuadraticRelPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegCurvetoQuadraticRelPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegCurvetoQuadraticRel>(exec); + return getDOMPrototype<JSSVGPathSegCurvetoQuadraticRel>(exec, globalObject); } const ClassInfo JSSVGPathSegCurvetoQuadraticRel::s_info = { "SVGPathSegCurvetoQuadraticRel", &JSSVGPathSeg::s_info, &JSSVGPathSegCurvetoQuadraticRelTable, 0 }; @@ -84,9 +84,9 @@ JSSVGPathSegCurvetoQuadraticRel::JSSVGPathSegCurvetoQuadraticRel(PassRefPtr<Stru { } -JSObject* JSSVGPathSegCurvetoQuadraticRel::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegCurvetoQuadraticRel::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegCurvetoQuadraticRelPrototype(JSSVGPathSegCurvetoQuadraticRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegCurvetoQuadraticRelPrototype(JSSVGPathSegCurvetoQuadraticRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegCurvetoQuadraticRel::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -94,63 +94,67 @@ bool JSSVGPathSegCurvetoQuadraticRel::getOwnPropertySlot(ExecState* exec, const return getStaticValueSlot<JSSVGPathSegCurvetoQuadraticRel, Base>(exec, &JSSVGPathSegCurvetoQuadraticRelTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegCurvetoQuadraticRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoQuadraticRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoQuadraticRel* imp = static_cast<SVGPathSegCurvetoQuadraticRel*>(static_cast<JSSVGPathSegCurvetoQuadraticRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsSVGPathSegCurvetoQuadraticRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoQuadraticRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoQuadraticRel* imp = static_cast<SVGPathSegCurvetoQuadraticRel*>(static_cast<JSSVGPathSegCurvetoQuadraticRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -JSValuePtr jsSVGPathSegCurvetoQuadraticRelX1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoQuadraticRelX1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoQuadraticRel* imp = static_cast<SVGPathSegCurvetoQuadraticRel*>(static_cast<JSSVGPathSegCurvetoQuadraticRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x1()); } -JSValuePtr jsSVGPathSegCurvetoQuadraticRelY1(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoQuadraticRelY1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoQuadraticRel* imp = static_cast<SVGPathSegCurvetoQuadraticRel*>(static_cast<JSSVGPathSegCurvetoQuadraticRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y1()); } -void JSSVGPathSegCurvetoQuadraticRel::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegCurvetoQuadraticRel::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegCurvetoQuadraticRel, Base>(exec, propertyName, value, &JSSVGPathSegCurvetoQuadraticRelTable, this, slot); } -void setJSSVGPathSegCurvetoQuadraticRelX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoQuadraticRelX(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoQuadraticRel* imp = static_cast<SVGPathSegCurvetoQuadraticRel*>(static_cast<JSSVGPathSegCurvetoQuadraticRel*>(thisObject)->impl()); - imp->setX(value->toFloat(exec)); + imp->setX(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoQuadraticRel*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoQuadraticRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoQuadraticRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoQuadraticRelY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoQuadraticRelY(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoQuadraticRel* imp = static_cast<SVGPathSegCurvetoQuadraticRel*>(static_cast<JSSVGPathSegCurvetoQuadraticRel*>(thisObject)->impl()); - imp->setY(value->toFloat(exec)); + imp->setY(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoQuadraticRel*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoQuadraticRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoQuadraticRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoQuadraticRelX1(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoQuadraticRelX1(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoQuadraticRel* imp = static_cast<SVGPathSegCurvetoQuadraticRel*>(static_cast<JSSVGPathSegCurvetoQuadraticRel*>(thisObject)->impl()); - imp->setX1(value->toFloat(exec)); + imp->setX1(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoQuadraticRel*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoQuadraticRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoQuadraticRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoQuadraticRelY1(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoQuadraticRelY1(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoQuadraticRel* imp = static_cast<SVGPathSegCurvetoQuadraticRel*>(static_cast<JSSVGPathSegCurvetoQuadraticRel*>(thisObject)->impl()); - imp->setY1(value->toFloat(exec)); + imp->setY1(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoQuadraticRel*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoQuadraticRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoQuadraticRel*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticRel.h index 17c9b33405..8ae0b14021 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticRel.h @@ -34,13 +34,13 @@ class JSSVGPathSegCurvetoQuadraticRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegCurvetoQuadraticRel(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegCurvetoQuadraticRel>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegCurvetoQuadraticRelPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegCurvetoQuadraticRelPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,14 +59,14 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegCurvetoQuadraticRelX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoQuadraticRelX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoQuadraticRelY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoQuadraticRelY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoQuadraticRelX1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoQuadraticRelX1(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoQuadraticRelY1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoQuadraticRelY1(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegCurvetoQuadraticRelX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoQuadraticRelX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoQuadraticRelY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoQuadraticRelY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoQuadraticRelX1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoQuadraticRelX1(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoQuadraticRelY1(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoQuadraticRelY1(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothAbs.cpp index 4a150f9857..f515b93f7b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothAbs.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegCurvetoQuadraticSmoothAbs) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegCurvetoQuadraticSmoothAbs); /* Hash table */ @@ -70,9 +70,9 @@ static const HashTable JSSVGPathSegCurvetoQuadraticSmoothAbsPrototypeTable = const ClassInfo JSSVGPathSegCurvetoQuadraticSmoothAbsPrototype::s_info = { "SVGPathSegCurvetoQuadraticSmoothAbsPrototype", 0, &JSSVGPathSegCurvetoQuadraticSmoothAbsPrototypeTable, 0 }; -JSObject* JSSVGPathSegCurvetoQuadraticSmoothAbsPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegCurvetoQuadraticSmoothAbsPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegCurvetoQuadraticSmoothAbs>(exec); + return getDOMPrototype<JSSVGPathSegCurvetoQuadraticSmoothAbs>(exec, globalObject); } const ClassInfo JSSVGPathSegCurvetoQuadraticSmoothAbs::s_info = { "SVGPathSegCurvetoQuadraticSmoothAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegCurvetoQuadraticSmoothAbsTable, 0 }; @@ -82,9 +82,9 @@ JSSVGPathSegCurvetoQuadraticSmoothAbs::JSSVGPathSegCurvetoQuadraticSmoothAbs(Pas { } -JSObject* JSSVGPathSegCurvetoQuadraticSmoothAbs::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegCurvetoQuadraticSmoothAbs::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegCurvetoQuadraticSmoothAbsPrototype(JSSVGPathSegCurvetoQuadraticSmoothAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegCurvetoQuadraticSmoothAbsPrototype(JSSVGPathSegCurvetoQuadraticSmoothAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegCurvetoQuadraticSmoothAbs::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -92,35 +92,37 @@ bool JSSVGPathSegCurvetoQuadraticSmoothAbs::getOwnPropertySlot(ExecState* exec, return getStaticValueSlot<JSSVGPathSegCurvetoQuadraticSmoothAbs, Base>(exec, &JSSVGPathSegCurvetoQuadraticSmoothAbsTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegCurvetoQuadraticSmoothAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoQuadraticSmoothAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoQuadraticSmoothAbs* imp = static_cast<SVGPathSegCurvetoQuadraticSmoothAbs*>(static_cast<JSSVGPathSegCurvetoQuadraticSmoothAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsSVGPathSegCurvetoQuadraticSmoothAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoQuadraticSmoothAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoQuadraticSmoothAbs* imp = static_cast<SVGPathSegCurvetoQuadraticSmoothAbs*>(static_cast<JSSVGPathSegCurvetoQuadraticSmoothAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -void JSSVGPathSegCurvetoQuadraticSmoothAbs::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegCurvetoQuadraticSmoothAbs::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegCurvetoQuadraticSmoothAbs, Base>(exec, propertyName, value, &JSSVGPathSegCurvetoQuadraticSmoothAbsTable, this, slot); } -void setJSSVGPathSegCurvetoQuadraticSmoothAbsX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoQuadraticSmoothAbsX(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoQuadraticSmoothAbs* imp = static_cast<SVGPathSegCurvetoQuadraticSmoothAbs*>(static_cast<JSSVGPathSegCurvetoQuadraticSmoothAbs*>(thisObject)->impl()); - imp->setX(value->toFloat(exec)); + imp->setX(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoQuadraticSmoothAbs*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoQuadraticSmoothAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoQuadraticSmoothAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoQuadraticSmoothAbsY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoQuadraticSmoothAbsY(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoQuadraticSmoothAbs* imp = static_cast<SVGPathSegCurvetoQuadraticSmoothAbs*>(static_cast<JSSVGPathSegCurvetoQuadraticSmoothAbs*>(thisObject)->impl()); - imp->setY(value->toFloat(exec)); + imp->setY(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoQuadraticSmoothAbs*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoQuadraticSmoothAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoQuadraticSmoothAbs*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothAbs.h index 95b5271d14..684dccef4b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothAbs.h @@ -34,13 +34,13 @@ class JSSVGPathSegCurvetoQuadraticSmoothAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegCurvetoQuadraticSmoothAbs(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegCurvetoQuadraticSmoothAbs>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegCurvetoQuadraticSmoothAbsPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegCurvetoQuadraticSmoothAbsPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,10 +59,10 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegCurvetoQuadraticSmoothAbsX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoQuadraticSmoothAbsX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoQuadraticSmoothAbsY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoQuadraticSmoothAbsY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegCurvetoQuadraticSmoothAbsX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoQuadraticSmoothAbsX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoQuadraticSmoothAbsY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoQuadraticSmoothAbsY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothRel.cpp index d2d2fe88a8..4eb0e14931 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothRel.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegCurvetoQuadraticSmoothRel) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegCurvetoQuadraticSmoothRel); /* Hash table */ @@ -70,9 +70,9 @@ static const HashTable JSSVGPathSegCurvetoQuadraticSmoothRelPrototypeTable = const ClassInfo JSSVGPathSegCurvetoQuadraticSmoothRelPrototype::s_info = { "SVGPathSegCurvetoQuadraticSmoothRelPrototype", 0, &JSSVGPathSegCurvetoQuadraticSmoothRelPrototypeTable, 0 }; -JSObject* JSSVGPathSegCurvetoQuadraticSmoothRelPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegCurvetoQuadraticSmoothRelPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegCurvetoQuadraticSmoothRel>(exec); + return getDOMPrototype<JSSVGPathSegCurvetoQuadraticSmoothRel>(exec, globalObject); } const ClassInfo JSSVGPathSegCurvetoQuadraticSmoothRel::s_info = { "SVGPathSegCurvetoQuadraticSmoothRel", &JSSVGPathSeg::s_info, &JSSVGPathSegCurvetoQuadraticSmoothRelTable, 0 }; @@ -82,9 +82,9 @@ JSSVGPathSegCurvetoQuadraticSmoothRel::JSSVGPathSegCurvetoQuadraticSmoothRel(Pas { } -JSObject* JSSVGPathSegCurvetoQuadraticSmoothRel::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegCurvetoQuadraticSmoothRel::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegCurvetoQuadraticSmoothRelPrototype(JSSVGPathSegCurvetoQuadraticSmoothRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegCurvetoQuadraticSmoothRelPrototype(JSSVGPathSegCurvetoQuadraticSmoothRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegCurvetoQuadraticSmoothRel::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -92,35 +92,37 @@ bool JSSVGPathSegCurvetoQuadraticSmoothRel::getOwnPropertySlot(ExecState* exec, return getStaticValueSlot<JSSVGPathSegCurvetoQuadraticSmoothRel, Base>(exec, &JSSVGPathSegCurvetoQuadraticSmoothRelTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegCurvetoQuadraticSmoothRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoQuadraticSmoothRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoQuadraticSmoothRel* imp = static_cast<SVGPathSegCurvetoQuadraticSmoothRel*>(static_cast<JSSVGPathSegCurvetoQuadraticSmoothRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsSVGPathSegCurvetoQuadraticSmoothRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegCurvetoQuadraticSmoothRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegCurvetoQuadraticSmoothRel* imp = static_cast<SVGPathSegCurvetoQuadraticSmoothRel*>(static_cast<JSSVGPathSegCurvetoQuadraticSmoothRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -void JSSVGPathSegCurvetoQuadraticSmoothRel::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegCurvetoQuadraticSmoothRel::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegCurvetoQuadraticSmoothRel, Base>(exec, propertyName, value, &JSSVGPathSegCurvetoQuadraticSmoothRelTable, this, slot); } -void setJSSVGPathSegCurvetoQuadraticSmoothRelX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoQuadraticSmoothRelX(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoQuadraticSmoothRel* imp = static_cast<SVGPathSegCurvetoQuadraticSmoothRel*>(static_cast<JSSVGPathSegCurvetoQuadraticSmoothRel*>(thisObject)->impl()); - imp->setX(value->toFloat(exec)); + imp->setX(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoQuadraticSmoothRel*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoQuadraticSmoothRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoQuadraticSmoothRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegCurvetoQuadraticSmoothRelY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegCurvetoQuadraticSmoothRelY(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegCurvetoQuadraticSmoothRel* imp = static_cast<SVGPathSegCurvetoQuadraticSmoothRel*>(static_cast<JSSVGPathSegCurvetoQuadraticSmoothRel*>(thisObject)->impl()); - imp->setY(value->toFloat(exec)); + imp->setY(value.toFloat(exec)); if (static_cast<JSSVGPathSegCurvetoQuadraticSmoothRel*>(thisObject)->context()) static_cast<JSSVGPathSegCurvetoQuadraticSmoothRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegCurvetoQuadraticSmoothRel*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothRel.h index b05a572a3e..6d3da03dde 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothRel.h @@ -34,13 +34,13 @@ class JSSVGPathSegCurvetoQuadraticSmoothRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegCurvetoQuadraticSmoothRel(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegCurvetoQuadraticSmoothRel>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegCurvetoQuadraticSmoothRelPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegCurvetoQuadraticSmoothRelPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,10 +59,10 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegCurvetoQuadraticSmoothRelX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoQuadraticSmoothRelX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegCurvetoQuadraticSmoothRelY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegCurvetoQuadraticSmoothRelY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegCurvetoQuadraticSmoothRelX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoQuadraticSmoothRelX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegCurvetoQuadraticSmoothRelY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegCurvetoQuadraticSmoothRelY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoAbs.cpp index cb5c8285f6..8021f72d7f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoAbs.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegLinetoAbs) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegLinetoAbs); /* Hash table */ @@ -70,9 +70,9 @@ static const HashTable JSSVGPathSegLinetoAbsPrototypeTable = const ClassInfo JSSVGPathSegLinetoAbsPrototype::s_info = { "SVGPathSegLinetoAbsPrototype", 0, &JSSVGPathSegLinetoAbsPrototypeTable, 0 }; -JSObject* JSSVGPathSegLinetoAbsPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegLinetoAbsPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegLinetoAbs>(exec); + return getDOMPrototype<JSSVGPathSegLinetoAbs>(exec, globalObject); } const ClassInfo JSSVGPathSegLinetoAbs::s_info = { "SVGPathSegLinetoAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegLinetoAbsTable, 0 }; @@ -82,9 +82,9 @@ JSSVGPathSegLinetoAbs::JSSVGPathSegLinetoAbs(PassRefPtr<Structure> structure, Pa { } -JSObject* JSSVGPathSegLinetoAbs::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegLinetoAbs::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegLinetoAbsPrototype(JSSVGPathSegLinetoAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegLinetoAbsPrototype(JSSVGPathSegLinetoAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegLinetoAbs::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -92,35 +92,37 @@ bool JSSVGPathSegLinetoAbs::getOwnPropertySlot(ExecState* exec, const Identifier return getStaticValueSlot<JSSVGPathSegLinetoAbs, Base>(exec, &JSSVGPathSegLinetoAbsTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegLinetoAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegLinetoAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegLinetoAbs* imp = static_cast<SVGPathSegLinetoAbs*>(static_cast<JSSVGPathSegLinetoAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsSVGPathSegLinetoAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegLinetoAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegLinetoAbs* imp = static_cast<SVGPathSegLinetoAbs*>(static_cast<JSSVGPathSegLinetoAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -void JSSVGPathSegLinetoAbs::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegLinetoAbs::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegLinetoAbs, Base>(exec, propertyName, value, &JSSVGPathSegLinetoAbsTable, this, slot); } -void setJSSVGPathSegLinetoAbsX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegLinetoAbsX(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegLinetoAbs* imp = static_cast<SVGPathSegLinetoAbs*>(static_cast<JSSVGPathSegLinetoAbs*>(thisObject)->impl()); - imp->setX(value->toFloat(exec)); + imp->setX(value.toFloat(exec)); if (static_cast<JSSVGPathSegLinetoAbs*>(thisObject)->context()) static_cast<JSSVGPathSegLinetoAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegLinetoAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegLinetoAbsY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegLinetoAbsY(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegLinetoAbs* imp = static_cast<SVGPathSegLinetoAbs*>(static_cast<JSSVGPathSegLinetoAbs*>(thisObject)->impl()); - imp->setY(value->toFloat(exec)); + imp->setY(value.toFloat(exec)); if (static_cast<JSSVGPathSegLinetoAbs*>(thisObject)->context()) static_cast<JSSVGPathSegLinetoAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegLinetoAbs*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoAbs.h index 3ba97a8d24..4f83e6ae51 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoAbs.h @@ -34,13 +34,13 @@ class JSSVGPathSegLinetoAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegLinetoAbs(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegLinetoAbs>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegLinetoAbsPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegLinetoAbsPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,10 +59,10 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegLinetoAbsX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegLinetoAbsX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegLinetoAbsY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegLinetoAbsY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegLinetoAbsX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegLinetoAbsX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegLinetoAbsY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegLinetoAbsY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalAbs.cpp index 9146742dd9..cc868c881f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalAbs.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegLinetoHorizontalAbs) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegLinetoHorizontalAbs); /* Hash table */ @@ -69,9 +69,9 @@ static const HashTable JSSVGPathSegLinetoHorizontalAbsPrototypeTable = const ClassInfo JSSVGPathSegLinetoHorizontalAbsPrototype::s_info = { "SVGPathSegLinetoHorizontalAbsPrototype", 0, &JSSVGPathSegLinetoHorizontalAbsPrototypeTable, 0 }; -JSObject* JSSVGPathSegLinetoHorizontalAbsPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegLinetoHorizontalAbsPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegLinetoHorizontalAbs>(exec); + return getDOMPrototype<JSSVGPathSegLinetoHorizontalAbs>(exec, globalObject); } const ClassInfo JSSVGPathSegLinetoHorizontalAbs::s_info = { "SVGPathSegLinetoHorizontalAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegLinetoHorizontalAbsTable, 0 }; @@ -81,9 +81,9 @@ JSSVGPathSegLinetoHorizontalAbs::JSSVGPathSegLinetoHorizontalAbs(PassRefPtr<Stru { } -JSObject* JSSVGPathSegLinetoHorizontalAbs::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegLinetoHorizontalAbs::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegLinetoHorizontalAbsPrototype(JSSVGPathSegLinetoHorizontalAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegLinetoHorizontalAbsPrototype(JSSVGPathSegLinetoHorizontalAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegLinetoHorizontalAbs::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -91,21 +91,22 @@ bool JSSVGPathSegLinetoHorizontalAbs::getOwnPropertySlot(ExecState* exec, const return getStaticValueSlot<JSSVGPathSegLinetoHorizontalAbs, Base>(exec, &JSSVGPathSegLinetoHorizontalAbsTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegLinetoHorizontalAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegLinetoHorizontalAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegLinetoHorizontalAbs* imp = static_cast<SVGPathSegLinetoHorizontalAbs*>(static_cast<JSSVGPathSegLinetoHorizontalAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -void JSSVGPathSegLinetoHorizontalAbs::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegLinetoHorizontalAbs::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegLinetoHorizontalAbs, Base>(exec, propertyName, value, &JSSVGPathSegLinetoHorizontalAbsTable, this, slot); } -void setJSSVGPathSegLinetoHorizontalAbsX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegLinetoHorizontalAbsX(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegLinetoHorizontalAbs* imp = static_cast<SVGPathSegLinetoHorizontalAbs*>(static_cast<JSSVGPathSegLinetoHorizontalAbs*>(thisObject)->impl()); - imp->setX(value->toFloat(exec)); + imp->setX(value.toFloat(exec)); if (static_cast<JSSVGPathSegLinetoHorizontalAbs*>(thisObject)->context()) static_cast<JSSVGPathSegLinetoHorizontalAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegLinetoHorizontalAbs*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalAbs.h index 65837175c9..733a66a208 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalAbs.h @@ -34,13 +34,13 @@ class JSSVGPathSegLinetoHorizontalAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegLinetoHorizontalAbs(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegLinetoHorizontalAbs>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegLinetoHorizontalAbsPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegLinetoHorizontalAbsPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,8 +59,8 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegLinetoHorizontalAbsX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegLinetoHorizontalAbsX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegLinetoHorizontalAbsX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegLinetoHorizontalAbsX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalRel.cpp index 925a07a65d..e222c2dd99 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalRel.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegLinetoHorizontalRel) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegLinetoHorizontalRel); /* Hash table */ @@ -69,9 +69,9 @@ static const HashTable JSSVGPathSegLinetoHorizontalRelPrototypeTable = const ClassInfo JSSVGPathSegLinetoHorizontalRelPrototype::s_info = { "SVGPathSegLinetoHorizontalRelPrototype", 0, &JSSVGPathSegLinetoHorizontalRelPrototypeTable, 0 }; -JSObject* JSSVGPathSegLinetoHorizontalRelPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegLinetoHorizontalRelPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegLinetoHorizontalRel>(exec); + return getDOMPrototype<JSSVGPathSegLinetoHorizontalRel>(exec, globalObject); } const ClassInfo JSSVGPathSegLinetoHorizontalRel::s_info = { "SVGPathSegLinetoHorizontalRel", &JSSVGPathSeg::s_info, &JSSVGPathSegLinetoHorizontalRelTable, 0 }; @@ -81,9 +81,9 @@ JSSVGPathSegLinetoHorizontalRel::JSSVGPathSegLinetoHorizontalRel(PassRefPtr<Stru { } -JSObject* JSSVGPathSegLinetoHorizontalRel::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegLinetoHorizontalRel::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegLinetoHorizontalRelPrototype(JSSVGPathSegLinetoHorizontalRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegLinetoHorizontalRelPrototype(JSSVGPathSegLinetoHorizontalRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegLinetoHorizontalRel::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -91,21 +91,22 @@ bool JSSVGPathSegLinetoHorizontalRel::getOwnPropertySlot(ExecState* exec, const return getStaticValueSlot<JSSVGPathSegLinetoHorizontalRel, Base>(exec, &JSSVGPathSegLinetoHorizontalRelTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegLinetoHorizontalRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegLinetoHorizontalRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegLinetoHorizontalRel* imp = static_cast<SVGPathSegLinetoHorizontalRel*>(static_cast<JSSVGPathSegLinetoHorizontalRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -void JSSVGPathSegLinetoHorizontalRel::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegLinetoHorizontalRel::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegLinetoHorizontalRel, Base>(exec, propertyName, value, &JSSVGPathSegLinetoHorizontalRelTable, this, slot); } -void setJSSVGPathSegLinetoHorizontalRelX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegLinetoHorizontalRelX(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegLinetoHorizontalRel* imp = static_cast<SVGPathSegLinetoHorizontalRel*>(static_cast<JSSVGPathSegLinetoHorizontalRel*>(thisObject)->impl()); - imp->setX(value->toFloat(exec)); + imp->setX(value.toFloat(exec)); if (static_cast<JSSVGPathSegLinetoHorizontalRel*>(thisObject)->context()) static_cast<JSSVGPathSegLinetoHorizontalRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegLinetoHorizontalRel*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalRel.h index 66e5d31c18..252653e27f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalRel.h @@ -34,13 +34,13 @@ class JSSVGPathSegLinetoHorizontalRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegLinetoHorizontalRel(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegLinetoHorizontalRel>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegLinetoHorizontalRelPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegLinetoHorizontalRelPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,8 +59,8 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegLinetoHorizontalRelX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegLinetoHorizontalRelX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegLinetoHorizontalRelX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegLinetoHorizontalRelX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoRel.cpp index 37efb942f2..742f362dba 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoRel.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegLinetoRel) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegLinetoRel); /* Hash table */ @@ -70,9 +70,9 @@ static const HashTable JSSVGPathSegLinetoRelPrototypeTable = const ClassInfo JSSVGPathSegLinetoRelPrototype::s_info = { "SVGPathSegLinetoRelPrototype", 0, &JSSVGPathSegLinetoRelPrototypeTable, 0 }; -JSObject* JSSVGPathSegLinetoRelPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegLinetoRelPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegLinetoRel>(exec); + return getDOMPrototype<JSSVGPathSegLinetoRel>(exec, globalObject); } const ClassInfo JSSVGPathSegLinetoRel::s_info = { "SVGPathSegLinetoRel", &JSSVGPathSeg::s_info, &JSSVGPathSegLinetoRelTable, 0 }; @@ -82,9 +82,9 @@ JSSVGPathSegLinetoRel::JSSVGPathSegLinetoRel(PassRefPtr<Structure> structure, Pa { } -JSObject* JSSVGPathSegLinetoRel::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegLinetoRel::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegLinetoRelPrototype(JSSVGPathSegLinetoRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegLinetoRelPrototype(JSSVGPathSegLinetoRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegLinetoRel::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -92,35 +92,37 @@ bool JSSVGPathSegLinetoRel::getOwnPropertySlot(ExecState* exec, const Identifier return getStaticValueSlot<JSSVGPathSegLinetoRel, Base>(exec, &JSSVGPathSegLinetoRelTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegLinetoRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegLinetoRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegLinetoRel* imp = static_cast<SVGPathSegLinetoRel*>(static_cast<JSSVGPathSegLinetoRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsSVGPathSegLinetoRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegLinetoRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegLinetoRel* imp = static_cast<SVGPathSegLinetoRel*>(static_cast<JSSVGPathSegLinetoRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -void JSSVGPathSegLinetoRel::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegLinetoRel::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegLinetoRel, Base>(exec, propertyName, value, &JSSVGPathSegLinetoRelTable, this, slot); } -void setJSSVGPathSegLinetoRelX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegLinetoRelX(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegLinetoRel* imp = static_cast<SVGPathSegLinetoRel*>(static_cast<JSSVGPathSegLinetoRel*>(thisObject)->impl()); - imp->setX(value->toFloat(exec)); + imp->setX(value.toFloat(exec)); if (static_cast<JSSVGPathSegLinetoRel*>(thisObject)->context()) static_cast<JSSVGPathSegLinetoRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegLinetoRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegLinetoRelY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegLinetoRelY(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegLinetoRel* imp = static_cast<SVGPathSegLinetoRel*>(static_cast<JSSVGPathSegLinetoRel*>(thisObject)->impl()); - imp->setY(value->toFloat(exec)); + imp->setY(value.toFloat(exec)); if (static_cast<JSSVGPathSegLinetoRel*>(thisObject)->context()) static_cast<JSSVGPathSegLinetoRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegLinetoRel*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoRel.h index b0ec02e0a4..1604c746b0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoRel.h @@ -34,13 +34,13 @@ class JSSVGPathSegLinetoRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegLinetoRel(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegLinetoRel>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegLinetoRelPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegLinetoRelPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,10 +59,10 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegLinetoRelX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegLinetoRelX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegLinetoRelY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegLinetoRelY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegLinetoRelX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegLinetoRelX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegLinetoRelY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegLinetoRelY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalAbs.cpp index aa9cba20ca..4d9cbb8e05 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalAbs.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegLinetoVerticalAbs) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegLinetoVerticalAbs); /* Hash table */ @@ -69,9 +69,9 @@ static const HashTable JSSVGPathSegLinetoVerticalAbsPrototypeTable = const ClassInfo JSSVGPathSegLinetoVerticalAbsPrototype::s_info = { "SVGPathSegLinetoVerticalAbsPrototype", 0, &JSSVGPathSegLinetoVerticalAbsPrototypeTable, 0 }; -JSObject* JSSVGPathSegLinetoVerticalAbsPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegLinetoVerticalAbsPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegLinetoVerticalAbs>(exec); + return getDOMPrototype<JSSVGPathSegLinetoVerticalAbs>(exec, globalObject); } const ClassInfo JSSVGPathSegLinetoVerticalAbs::s_info = { "SVGPathSegLinetoVerticalAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegLinetoVerticalAbsTable, 0 }; @@ -81,9 +81,9 @@ JSSVGPathSegLinetoVerticalAbs::JSSVGPathSegLinetoVerticalAbs(PassRefPtr<Structur { } -JSObject* JSSVGPathSegLinetoVerticalAbs::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegLinetoVerticalAbs::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegLinetoVerticalAbsPrototype(JSSVGPathSegLinetoVerticalAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegLinetoVerticalAbsPrototype(JSSVGPathSegLinetoVerticalAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegLinetoVerticalAbs::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -91,21 +91,22 @@ bool JSSVGPathSegLinetoVerticalAbs::getOwnPropertySlot(ExecState* exec, const Id return getStaticValueSlot<JSSVGPathSegLinetoVerticalAbs, Base>(exec, &JSSVGPathSegLinetoVerticalAbsTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegLinetoVerticalAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegLinetoVerticalAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegLinetoVerticalAbs* imp = static_cast<SVGPathSegLinetoVerticalAbs*>(static_cast<JSSVGPathSegLinetoVerticalAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -void JSSVGPathSegLinetoVerticalAbs::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegLinetoVerticalAbs::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegLinetoVerticalAbs, Base>(exec, propertyName, value, &JSSVGPathSegLinetoVerticalAbsTable, this, slot); } -void setJSSVGPathSegLinetoVerticalAbsY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegLinetoVerticalAbsY(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegLinetoVerticalAbs* imp = static_cast<SVGPathSegLinetoVerticalAbs*>(static_cast<JSSVGPathSegLinetoVerticalAbs*>(thisObject)->impl()); - imp->setY(value->toFloat(exec)); + imp->setY(value.toFloat(exec)); if (static_cast<JSSVGPathSegLinetoVerticalAbs*>(thisObject)->context()) static_cast<JSSVGPathSegLinetoVerticalAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegLinetoVerticalAbs*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalAbs.h index 52f48f655b..3585ae4092 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalAbs.h @@ -34,13 +34,13 @@ class JSSVGPathSegLinetoVerticalAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegLinetoVerticalAbs(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegLinetoVerticalAbs>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegLinetoVerticalAbsPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegLinetoVerticalAbsPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,8 +59,8 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegLinetoVerticalAbsY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegLinetoVerticalAbsY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegLinetoVerticalAbsY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegLinetoVerticalAbsY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalRel.cpp index e0b8b2b85d..c6681850d2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalRel.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegLinetoVerticalRel) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegLinetoVerticalRel); /* Hash table */ @@ -69,9 +69,9 @@ static const HashTable JSSVGPathSegLinetoVerticalRelPrototypeTable = const ClassInfo JSSVGPathSegLinetoVerticalRelPrototype::s_info = { "SVGPathSegLinetoVerticalRelPrototype", 0, &JSSVGPathSegLinetoVerticalRelPrototypeTable, 0 }; -JSObject* JSSVGPathSegLinetoVerticalRelPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegLinetoVerticalRelPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegLinetoVerticalRel>(exec); + return getDOMPrototype<JSSVGPathSegLinetoVerticalRel>(exec, globalObject); } const ClassInfo JSSVGPathSegLinetoVerticalRel::s_info = { "SVGPathSegLinetoVerticalRel", &JSSVGPathSeg::s_info, &JSSVGPathSegLinetoVerticalRelTable, 0 }; @@ -81,9 +81,9 @@ JSSVGPathSegLinetoVerticalRel::JSSVGPathSegLinetoVerticalRel(PassRefPtr<Structur { } -JSObject* JSSVGPathSegLinetoVerticalRel::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegLinetoVerticalRel::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegLinetoVerticalRelPrototype(JSSVGPathSegLinetoVerticalRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegLinetoVerticalRelPrototype(JSSVGPathSegLinetoVerticalRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegLinetoVerticalRel::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -91,21 +91,22 @@ bool JSSVGPathSegLinetoVerticalRel::getOwnPropertySlot(ExecState* exec, const Id return getStaticValueSlot<JSSVGPathSegLinetoVerticalRel, Base>(exec, &JSSVGPathSegLinetoVerticalRelTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegLinetoVerticalRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegLinetoVerticalRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegLinetoVerticalRel* imp = static_cast<SVGPathSegLinetoVerticalRel*>(static_cast<JSSVGPathSegLinetoVerticalRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -void JSSVGPathSegLinetoVerticalRel::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegLinetoVerticalRel::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegLinetoVerticalRel, Base>(exec, propertyName, value, &JSSVGPathSegLinetoVerticalRelTable, this, slot); } -void setJSSVGPathSegLinetoVerticalRelY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegLinetoVerticalRelY(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegLinetoVerticalRel* imp = static_cast<SVGPathSegLinetoVerticalRel*>(static_cast<JSSVGPathSegLinetoVerticalRel*>(thisObject)->impl()); - imp->setY(value->toFloat(exec)); + imp->setY(value.toFloat(exec)); if (static_cast<JSSVGPathSegLinetoVerticalRel*>(thisObject)->context()) static_cast<JSSVGPathSegLinetoVerticalRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegLinetoVerticalRel*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalRel.h index 0cdb26b9fd..4b7f295992 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalRel.h @@ -34,13 +34,13 @@ class JSSVGPathSegLinetoVerticalRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegLinetoVerticalRel(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegLinetoVerticalRel>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegLinetoVerticalRelPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegLinetoVerticalRelPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,8 +59,8 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegLinetoVerticalRelY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegLinetoVerticalRelY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegLinetoVerticalRelY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegLinetoVerticalRelY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegList.cpp index 069f6d9c7b..f7877e87a2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegList.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegList) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegList); /* Hash table */ @@ -78,9 +78,9 @@ static const HashTable JSSVGPathSegListPrototypeTable = const ClassInfo JSSVGPathSegListPrototype::s_info = { "SVGPathSegListPrototype", 0, &JSSVGPathSegListPrototypeTable, 0 }; -JSObject* JSSVGPathSegListPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegList>(exec); + return getDOMPrototype<JSSVGPathSegList>(exec, globalObject); } bool JSSVGPathSegListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -100,12 +100,11 @@ JSSVGPathSegList::JSSVGPathSegList(PassRefPtr<Structure> structure, PassRefPtr<S JSSVGPathSegList::~JSSVGPathSegList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGPathSegList::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegListPrototype(JSSVGPathSegListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGPathSegListPrototype(JSSVGPathSegListPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGPathSegList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -113,75 +112,83 @@ bool JSSVGPathSegList::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSSVGPathSegList, Base>(exec, &JSSVGPathSegListTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegList* imp = static_cast<SVGPathSegList*>(static_cast<JSSVGPathSegList*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->numberOfItems()); } -JSValuePtr jsSVGPathSegListPrototypeFunctionClear(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathSegListPrototypeFunctionClear(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathSegList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathSegList::s_info)) return throwError(exec, TypeError); JSSVGPathSegList* castedThisObj = static_cast<JSSVGPathSegList*>(asObject(thisValue)); return castedThisObj->clear(exec, args); } -JSValuePtr jsSVGPathSegListPrototypeFunctionInitialize(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathSegListPrototypeFunctionInitialize(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathSegList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathSegList::s_info)) return throwError(exec, TypeError); JSSVGPathSegList* castedThisObj = static_cast<JSSVGPathSegList*>(asObject(thisValue)); return castedThisObj->initialize(exec, args); } -JSValuePtr jsSVGPathSegListPrototypeFunctionGetItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathSegListPrototypeFunctionGetItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathSegList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathSegList::s_info)) return throwError(exec, TypeError); JSSVGPathSegList* castedThisObj = static_cast<JSSVGPathSegList*>(asObject(thisValue)); return castedThisObj->getItem(exec, args); } -JSValuePtr jsSVGPathSegListPrototypeFunctionInsertItemBefore(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathSegListPrototypeFunctionInsertItemBefore(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathSegList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathSegList::s_info)) return throwError(exec, TypeError); JSSVGPathSegList* castedThisObj = static_cast<JSSVGPathSegList*>(asObject(thisValue)); return castedThisObj->insertItemBefore(exec, args); } -JSValuePtr jsSVGPathSegListPrototypeFunctionReplaceItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathSegListPrototypeFunctionReplaceItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathSegList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathSegList::s_info)) return throwError(exec, TypeError); JSSVGPathSegList* castedThisObj = static_cast<JSSVGPathSegList*>(asObject(thisValue)); return castedThisObj->replaceItem(exec, args); } -JSValuePtr jsSVGPathSegListPrototypeFunctionRemoveItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathSegListPrototypeFunctionRemoveItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathSegList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathSegList::s_info)) return throwError(exec, TypeError); JSSVGPathSegList* castedThisObj = static_cast<JSSVGPathSegList*>(asObject(thisValue)); return castedThisObj->removeItem(exec, args); } -JSValuePtr jsSVGPathSegListPrototypeFunctionAppendItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPathSegListPrototypeFunctionAppendItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPathSegList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPathSegList::s_info)) return throwError(exec, TypeError); JSSVGPathSegList* castedThisObj = static_cast<JSSVGPathSegList*>(asObject(thisValue)); return castedThisObj->appendItem(exec, args); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGPathSegList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGPathSegList* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGPathSegList>(exec, object, context); } -SVGPathSegList* toSVGPathSegList(JSC::JSValuePtr value) +SVGPathSegList* toSVGPathSegList(JSC::JSValue value) { - return value->isObject(&JSSVGPathSegList::s_info) ? static_cast<JSSVGPathSegList*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGPathSegList::s_info) ? static_cast<JSSVGPathSegList*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegList.h index 39a741e5b6..3faf15d8bf 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegList.h @@ -37,25 +37,25 @@ class JSSVGPathSegList : public DOMObject { public: JSSVGPathSegList(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegList>, SVGElement* context); virtual ~JSSVGPathSegList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } // Custom functions - JSC::JSValuePtr clear(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr initialize(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr getItem(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr insertItemBefore(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr replaceItem(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr removeItem(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr appendItem(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue clear(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue initialize(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue getItem(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue insertItemBefore(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue replaceItem(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue removeItem(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue appendItem(JSC::ExecState*, const JSC::ArgList&); SVGPathSegList* impl() const { return m_impl.get(); } SVGElement* context() const { return m_context.get(); } @@ -64,16 +64,17 @@ private: RefPtr<SVGPathSegList > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGPathSegList*, SVGElement* context); -SVGPathSegList* toSVGPathSegList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGPathSegList*, SVGElement* context); +SVGPathSegList* toSVGPathSegList(JSC::JSValue); class JSSVGPathSegListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -82,16 +83,16 @@ public: // Functions -JSC::JSValuePtr jsSVGPathSegListPrototypeFunctionClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathSegListPrototypeFunctionInitialize(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathSegListPrototypeFunctionGetItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathSegListPrototypeFunctionInsertItemBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathSegListPrototypeFunctionReplaceItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathSegListPrototypeFunctionRemoveItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPathSegListPrototypeFunctionAppendItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathSegListPrototypeFunctionClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathSegListPrototypeFunctionInitialize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathSegListPrototypeFunctionGetItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathSegListPrototypeFunctionInsertItemBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathSegListPrototypeFunctionReplaceItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathSegListPrototypeFunctionRemoveItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPathSegListPrototypeFunctionAppendItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGPathSegListNumberOfItems(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPathSegListNumberOfItems(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoAbs.cpp index 9673c45358..9df40008af 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoAbs.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegMovetoAbs) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegMovetoAbs); /* Hash table */ @@ -70,9 +70,9 @@ static const HashTable JSSVGPathSegMovetoAbsPrototypeTable = const ClassInfo JSSVGPathSegMovetoAbsPrototype::s_info = { "SVGPathSegMovetoAbsPrototype", 0, &JSSVGPathSegMovetoAbsPrototypeTable, 0 }; -JSObject* JSSVGPathSegMovetoAbsPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegMovetoAbsPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegMovetoAbs>(exec); + return getDOMPrototype<JSSVGPathSegMovetoAbs>(exec, globalObject); } const ClassInfo JSSVGPathSegMovetoAbs::s_info = { "SVGPathSegMovetoAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegMovetoAbsTable, 0 }; @@ -82,9 +82,9 @@ JSSVGPathSegMovetoAbs::JSSVGPathSegMovetoAbs(PassRefPtr<Structure> structure, Pa { } -JSObject* JSSVGPathSegMovetoAbs::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegMovetoAbs::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegMovetoAbsPrototype(JSSVGPathSegMovetoAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegMovetoAbsPrototype(JSSVGPathSegMovetoAbsPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegMovetoAbs::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -92,35 +92,37 @@ bool JSSVGPathSegMovetoAbs::getOwnPropertySlot(ExecState* exec, const Identifier return getStaticValueSlot<JSSVGPathSegMovetoAbs, Base>(exec, &JSSVGPathSegMovetoAbsTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegMovetoAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegMovetoAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegMovetoAbs* imp = static_cast<SVGPathSegMovetoAbs*>(static_cast<JSSVGPathSegMovetoAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsSVGPathSegMovetoAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegMovetoAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegMovetoAbs* imp = static_cast<SVGPathSegMovetoAbs*>(static_cast<JSSVGPathSegMovetoAbs*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -void JSSVGPathSegMovetoAbs::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegMovetoAbs::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegMovetoAbs, Base>(exec, propertyName, value, &JSSVGPathSegMovetoAbsTable, this, slot); } -void setJSSVGPathSegMovetoAbsX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegMovetoAbsX(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegMovetoAbs* imp = static_cast<SVGPathSegMovetoAbs*>(static_cast<JSSVGPathSegMovetoAbs*>(thisObject)->impl()); - imp->setX(value->toFloat(exec)); + imp->setX(value.toFloat(exec)); if (static_cast<JSSVGPathSegMovetoAbs*>(thisObject)->context()) static_cast<JSSVGPathSegMovetoAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegMovetoAbs*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegMovetoAbsY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegMovetoAbsY(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegMovetoAbs* imp = static_cast<SVGPathSegMovetoAbs*>(static_cast<JSSVGPathSegMovetoAbs*>(thisObject)->impl()); - imp->setY(value->toFloat(exec)); + imp->setY(value.toFloat(exec)); if (static_cast<JSSVGPathSegMovetoAbs*>(thisObject)->context()) static_cast<JSSVGPathSegMovetoAbs*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegMovetoAbs*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoAbs.h index 1dffdfb3a2..8a112bf649 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoAbs.h @@ -34,13 +34,13 @@ class JSSVGPathSegMovetoAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegMovetoAbs(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegMovetoAbs>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegMovetoAbsPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegMovetoAbsPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,10 +59,10 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegMovetoAbsX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegMovetoAbsX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegMovetoAbsY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegMovetoAbsY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegMovetoAbsX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegMovetoAbsX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegMovetoAbsY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegMovetoAbsY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoRel.cpp index 5ef4069172..70ef82a297 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoRel.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegMovetoRel) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPathSegMovetoRel); /* Hash table */ @@ -70,9 +70,9 @@ static const HashTable JSSVGPathSegMovetoRelPrototypeTable = const ClassInfo JSSVGPathSegMovetoRelPrototype::s_info = { "SVGPathSegMovetoRelPrototype", 0, &JSSVGPathSegMovetoRelPrototypeTable, 0 }; -JSObject* JSSVGPathSegMovetoRelPrototype::self(ExecState* exec) +JSObject* JSSVGPathSegMovetoRelPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPathSegMovetoRel>(exec); + return getDOMPrototype<JSSVGPathSegMovetoRel>(exec, globalObject); } const ClassInfo JSSVGPathSegMovetoRel::s_info = { "SVGPathSegMovetoRel", &JSSVGPathSeg::s_info, &JSSVGPathSegMovetoRelTable, 0 }; @@ -82,9 +82,9 @@ JSSVGPathSegMovetoRel::JSSVGPathSegMovetoRel(PassRefPtr<Structure> structure, Pa { } -JSObject* JSSVGPathSegMovetoRel::createPrototype(ExecState* exec) +JSObject* JSSVGPathSegMovetoRel::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPathSegMovetoRelPrototype(JSSVGPathSegMovetoRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec))); + return new (exec) JSSVGPathSegMovetoRelPrototype(JSSVGPathSegMovetoRelPrototype::createStructure(JSSVGPathSegPrototype::self(exec, globalObject))); } bool JSSVGPathSegMovetoRel::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -92,35 +92,37 @@ bool JSSVGPathSegMovetoRel::getOwnPropertySlot(ExecState* exec, const Identifier return getStaticValueSlot<JSSVGPathSegMovetoRel, Base>(exec, &JSSVGPathSegMovetoRelTable, this, propertyName, slot); } -JSValuePtr jsSVGPathSegMovetoRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegMovetoRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegMovetoRel* imp = static_cast<SVGPathSegMovetoRel*>(static_cast<JSSVGPathSegMovetoRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsSVGPathSegMovetoRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPathSegMovetoRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPathSegMovetoRel* imp = static_cast<SVGPathSegMovetoRel*>(static_cast<JSSVGPathSegMovetoRel*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -void JSSVGPathSegMovetoRel::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPathSegMovetoRel::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPathSegMovetoRel, Base>(exec, propertyName, value, &JSSVGPathSegMovetoRelTable, this, slot); } -void setJSSVGPathSegMovetoRelX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegMovetoRelX(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegMovetoRel* imp = static_cast<SVGPathSegMovetoRel*>(static_cast<JSSVGPathSegMovetoRel*>(thisObject)->impl()); - imp->setX(value->toFloat(exec)); + imp->setX(value.toFloat(exec)); if (static_cast<JSSVGPathSegMovetoRel*>(thisObject)->context()) static_cast<JSSVGPathSegMovetoRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegMovetoRel*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPathSegMovetoRelY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPathSegMovetoRelY(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPathSegMovetoRel* imp = static_cast<SVGPathSegMovetoRel*>(static_cast<JSSVGPathSegMovetoRel*>(thisObject)->impl()); - imp->setY(value->toFloat(exec)); + imp->setY(value.toFloat(exec)); if (static_cast<JSSVGPathSegMovetoRel*>(thisObject)->context()) static_cast<JSSVGPathSegMovetoRel*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPathSegMovetoRel*>(thisObject)->impl()->associatedAttributeName()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoRel.h index 2027c3f8f0..2e1c91cdcf 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoRel.h @@ -34,13 +34,13 @@ class JSSVGPathSegMovetoRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: JSSVGPathSegMovetoRel(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPathSegMovetoRel>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGPathSegMovetoRelPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGPathSegMovetoRelPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,10 +59,10 @@ public: // Attributes -JSC::JSValuePtr jsSVGPathSegMovetoRelX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegMovetoRelX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPathSegMovetoRelY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPathSegMovetoRelY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPathSegMovetoRelX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegMovetoRelX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPathSegMovetoRelY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPathSegMovetoRelY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPatternElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPatternElement.cpp index 35353d49fe..0cd9b52a4b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPatternElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPatternElement.cpp @@ -52,7 +52,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPatternElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPatternElement); /* Hash table */ @@ -104,9 +104,9 @@ static const HashTable JSSVGPatternElementPrototypeTable = const ClassInfo JSSVGPatternElementPrototype::s_info = { "SVGPatternElementPrototype", 0, &JSSVGPatternElementPrototypeTable, 0 }; -JSObject* JSSVGPatternElementPrototype::self(ExecState* exec) +JSObject* JSSVGPatternElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPatternElement>(exec); + return getDOMPrototype<JSSVGPatternElement>(exec, globalObject); } bool JSSVGPatternElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -121,9 +121,9 @@ JSSVGPatternElement::JSSVGPatternElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSSVGPatternElement::createPrototype(ExecState* exec) +JSObject* JSSVGPatternElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPatternElementPrototype(JSSVGPatternElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGPatternElementPrototype(JSSVGPatternElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGPatternElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -131,166 +131,186 @@ bool JSSVGPatternElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGPatternElement, Base>(exec, &JSSVGPatternElementTable, this, propertyName, slot); } -JSValuePtr jsSVGPatternElementPatternUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementPatternUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->patternUnitsAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPatternElementPatternContentUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementPatternContentUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->patternContentUnitsAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPatternElementPatternTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementPatternTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->patternTransformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPatternElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPatternElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPatternElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPatternElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPatternElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->hrefAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPatternElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGPatternElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGPatternElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGPatternElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGPatternElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGPatternElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPatternElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPatternElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGPatternElementViewBox(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementViewBox(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedRect> obj = imp->viewBoxAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPatternElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPatternElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedPreserveAspectRatio> obj = imp->preserveAspectRatioAnimated(); return toJS(exec, obj.get(), imp); } -void JSSVGPatternElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPatternElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPatternElement, Base>(exec, propertyName, value, &JSSVGPatternElementTable, this, slot); } -void setJSSVGPatternElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPatternElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGPatternElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPatternElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPatternElement* imp = static_cast<SVGPatternElement*>(static_cast<JSSVGPatternElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGPatternElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPatternElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPatternElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPatternElement::s_info)) return throwError(exec, TypeError); JSSVGPatternElement* castedThisObj = static_cast<JSSVGPatternElement*>(asObject(thisValue)); SVGPatternElement* imp = static_cast<SVGPatternElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGPatternElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPatternElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPatternElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPatternElement::s_info)) return throwError(exec, TypeError); JSSVGPatternElement* castedThisObj = static_cast<JSSVGPatternElement*>(asObject(thisValue)); SVGPatternElement* imp = static_cast<SVGPatternElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPatternElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPatternElement.h index 6d11bc1c51..10efc5259d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPatternElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPatternElement.h @@ -34,13 +34,13 @@ class JSSVGPatternElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGPatternElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPatternElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGPatternElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,30 +64,30 @@ public: // Functions -JSC::JSValuePtr jsSVGPatternElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPatternElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPatternElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPatternElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGPatternElementPatternUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPatternElementPatternContentUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPatternElementPatternTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPatternElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPatternElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPatternElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPatternElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPatternElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPatternElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPatternElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPatternElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPatternElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPatternElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPatternElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPatternElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPatternElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPatternElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPatternElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPatternElementViewBox(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPatternElementPreserveAspectRatio(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPatternElementPatternUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPatternElementPatternContentUnits(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPatternElementPatternTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPatternElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPatternElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPatternElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPatternElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPatternElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPatternElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPatternElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPatternElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPatternElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPatternElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPatternElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPatternElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPatternElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPatternElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPatternElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPatternElementViewBox(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPatternElementPreserveAspectRatio(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPoint.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPoint.cpp index 633745cb06..b587ac93c8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPoint.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPoint.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPoint) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPoint); /* Hash table */ @@ -73,9 +73,9 @@ static const HashTable JSSVGPointPrototypeTable = const ClassInfo JSSVGPointPrototype::s_info = { "SVGPointPrototype", 0, &JSSVGPointPrototypeTable, 0 }; -JSObject* JSSVGPointPrototype::self(ExecState* exec) +JSObject* JSSVGPointPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPoint>(exec); + return getDOMPrototype<JSSVGPoint>(exec, globalObject); } bool JSSVGPointPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -95,12 +95,11 @@ JSSVGPoint::JSSVGPoint(PassRefPtr<Structure> structure, PassRefPtr<JSSVGPODTypeW JSSVGPoint::~JSSVGPoint() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGPoint::createPrototype(ExecState* exec) +JSObject* JSSVGPoint::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPointPrototype(JSSVGPointPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGPointPrototype(JSSVGPointPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGPoint::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -108,59 +107,62 @@ bool JSSVGPoint::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN return getStaticValueSlot<JSSVGPoint, Base>(exec, &JSSVGPointTable, this, propertyName, slot); } -JSValuePtr jsSVGPointX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPointX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); FloatPoint imp(*static_cast<JSSVGPoint*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp.x()); } -JSValuePtr jsSVGPointY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPointY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); FloatPoint imp(*static_cast<JSSVGPoint*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp.y()); } -void JSSVGPoint::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPoint::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPoint, Base>(exec, propertyName, value, &JSSVGPointTable, this, slot); } -void setJSSVGPointX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPointX(ExecState* exec, JSObject* thisObject, JSValue value) { FloatPoint imp(*static_cast<JSSVGPoint*>(thisObject)->impl()); - imp.setX(value->toFloat(exec)); + imp.setX(value.toFloat(exec)); static_cast<JSSVGPoint*>(thisObject)->impl()->commitChange(imp, static_cast<JSSVGPoint*>(thisObject)->context()); } -void setJSSVGPointY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPointY(ExecState* exec, JSObject* thisObject, JSValue value) { FloatPoint imp(*static_cast<JSSVGPoint*>(thisObject)->impl()); - imp.setY(value->toFloat(exec)); + imp.setY(value.toFloat(exec)); static_cast<JSSVGPoint*>(thisObject)->impl()->commitChange(imp, static_cast<JSSVGPoint*>(thisObject)->context()); } -JSValuePtr jsSVGPointPrototypeFunctionMatrixTransform(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPointPrototypeFunctionMatrixTransform(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPoint::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPoint::s_info)) return throwError(exec, TypeError); JSSVGPoint* castedThisObj = static_cast<JSSVGPoint*>(asObject(thisValue)); JSSVGPODTypeWrapper<FloatPoint>* wrapper = castedThisObj->impl(); FloatPoint imp(*wrapper); - TransformationMatrix matrix = toSVGMatrix(args.at(exec, 0)); + TransformationMatrix matrix = toSVGMatrix(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatPoint>::create(imp.matrixTransform(matrix)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatPoint>::create(imp.matrixTransform(matrix)).get(), castedThisObj->context()); wrapper->commitChange(imp, castedThisObj->context()); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper<FloatPoint>* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper<FloatPoint>* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGPoint, JSSVGPODTypeWrapper<FloatPoint> >(exec, object, context); } -FloatPoint toSVGPoint(JSC::JSValuePtr value) +FloatPoint toSVGPoint(JSC::JSValue value) { - return value->isObject(&JSSVGPoint::s_info) ? (FloatPoint) *static_cast<JSSVGPoint*>(asObject(value))->impl() : FloatPoint(); + return value.isObject(&JSSVGPoint::s_info) ? (FloatPoint) *static_cast<JSSVGPoint*>(asObject(value))->impl() : FloatPoint(); } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPoint.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPoint.h index fae362a5f3..0973a867e7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPoint.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPoint.h @@ -37,13 +37,13 @@ class JSSVGPoint : public DOMObject { public: JSSVGPoint(PassRefPtr<JSC::Structure>, PassRefPtr<JSSVGPODTypeWrapper<FloatPoint> >, SVGElement* context); virtual ~JSSVGPoint(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -56,16 +56,17 @@ private: RefPtr<JSSVGPODTypeWrapper<FloatPoint> > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, JSSVGPODTypeWrapper<FloatPoint>*, SVGElement* context); -FloatPoint toSVGPoint(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, JSSVGPODTypeWrapper<FloatPoint>*, SVGElement* context); +FloatPoint toSVGPoint(JSC::JSValue); class JSSVGPointPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -74,13 +75,13 @@ public: // Functions -JSC::JSValuePtr jsSVGPointPrototypeFunctionMatrixTransform(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPointPrototypeFunctionMatrixTransform(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGPointX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPointX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPointY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPointY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGPointX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPointX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPointY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPointY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPointList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPointList.cpp index 7eebc21368..4dd7afd8f7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPointList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPointList.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPointList) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPointList); /* Hash table */ @@ -77,9 +77,9 @@ static const HashTable JSSVGPointListPrototypeTable = const ClassInfo JSSVGPointListPrototype::s_info = { "SVGPointListPrototype", 0, &JSSVGPointListPrototypeTable, 0 }; -JSObject* JSSVGPointListPrototype::self(ExecState* exec) +JSObject* JSSVGPointListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPointList>(exec); + return getDOMPrototype<JSSVGPointList>(exec, globalObject); } bool JSSVGPointListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -99,12 +99,11 @@ JSSVGPointList::JSSVGPointList(PassRefPtr<Structure> structure, PassRefPtr<SVGPo JSSVGPointList::~JSSVGPointList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGPointList::createPrototype(ExecState* exec) +JSObject* JSSVGPointList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPointListPrototype(JSSVGPointListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGPointListPrototype(JSSVGPointListPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGPointList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -112,75 +111,83 @@ bool JSSVGPointList::getOwnPropertySlot(ExecState* exec, const Identifier& prope return getStaticValueSlot<JSSVGPointList, Base>(exec, &JSSVGPointListTable, this, propertyName, slot); } -JSValuePtr jsSVGPointListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPointListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPointList* imp = static_cast<SVGPointList*>(static_cast<JSSVGPointList*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->numberOfItems()); } -JSValuePtr jsSVGPointListPrototypeFunctionClear(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPointListPrototypeFunctionClear(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPointList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPointList::s_info)) return throwError(exec, TypeError); JSSVGPointList* castedThisObj = static_cast<JSSVGPointList*>(asObject(thisValue)); return castedThisObj->clear(exec, args); } -JSValuePtr jsSVGPointListPrototypeFunctionInitialize(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPointListPrototypeFunctionInitialize(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPointList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPointList::s_info)) return throwError(exec, TypeError); JSSVGPointList* castedThisObj = static_cast<JSSVGPointList*>(asObject(thisValue)); return castedThisObj->initialize(exec, args); } -JSValuePtr jsSVGPointListPrototypeFunctionGetItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPointListPrototypeFunctionGetItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPointList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPointList::s_info)) return throwError(exec, TypeError); JSSVGPointList* castedThisObj = static_cast<JSSVGPointList*>(asObject(thisValue)); return castedThisObj->getItem(exec, args); } -JSValuePtr jsSVGPointListPrototypeFunctionInsertItemBefore(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPointListPrototypeFunctionInsertItemBefore(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPointList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPointList::s_info)) return throwError(exec, TypeError); JSSVGPointList* castedThisObj = static_cast<JSSVGPointList*>(asObject(thisValue)); return castedThisObj->insertItemBefore(exec, args); } -JSValuePtr jsSVGPointListPrototypeFunctionReplaceItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPointListPrototypeFunctionReplaceItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPointList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPointList::s_info)) return throwError(exec, TypeError); JSSVGPointList* castedThisObj = static_cast<JSSVGPointList*>(asObject(thisValue)); return castedThisObj->replaceItem(exec, args); } -JSValuePtr jsSVGPointListPrototypeFunctionRemoveItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPointListPrototypeFunctionRemoveItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPointList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPointList::s_info)) return throwError(exec, TypeError); JSSVGPointList* castedThisObj = static_cast<JSSVGPointList*>(asObject(thisValue)); return castedThisObj->removeItem(exec, args); } -JSValuePtr jsSVGPointListPrototypeFunctionAppendItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPointListPrototypeFunctionAppendItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPointList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPointList::s_info)) return throwError(exec, TypeError); JSSVGPointList* castedThisObj = static_cast<JSSVGPointList*>(asObject(thisValue)); return castedThisObj->appendItem(exec, args); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGPointList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGPointList* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGPointList>(exec, object, context); } -SVGPointList* toSVGPointList(JSC::JSValuePtr value) +SVGPointList* toSVGPointList(JSC::JSValue value) { - return value->isObject(&JSSVGPointList::s_info) ? static_cast<JSSVGPointList*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGPointList::s_info) ? static_cast<JSSVGPointList*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPointList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPointList.h index c28355a653..58bf1e1351 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPointList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPointList.h @@ -37,25 +37,25 @@ class JSSVGPointList : public DOMObject { public: JSSVGPointList(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPointList>, SVGElement* context); virtual ~JSSVGPointList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } // Custom functions - JSC::JSValuePtr clear(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr initialize(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr getItem(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr insertItemBefore(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr replaceItem(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr removeItem(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr appendItem(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue clear(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue initialize(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue getItem(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue insertItemBefore(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue replaceItem(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue removeItem(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue appendItem(JSC::ExecState*, const JSC::ArgList&); SVGPointList* impl() const { return m_impl.get(); } SVGElement* context() const { return m_context.get(); } @@ -64,16 +64,17 @@ private: RefPtr<SVGPointList > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGPointList*, SVGElement* context); -SVGPointList* toSVGPointList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGPointList*, SVGElement* context); +SVGPointList* toSVGPointList(JSC::JSValue); class JSSVGPointListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -82,16 +83,16 @@ public: // Functions -JSC::JSValuePtr jsSVGPointListPrototypeFunctionClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPointListPrototypeFunctionInitialize(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPointListPrototypeFunctionGetItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPointListPrototypeFunctionInsertItemBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPointListPrototypeFunctionReplaceItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPointListPrototypeFunctionRemoveItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPointListPrototypeFunctionAppendItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPointListPrototypeFunctionClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPointListPrototypeFunctionInitialize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPointListPrototypeFunctionGetItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPointListPrototypeFunctionInsertItemBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPointListPrototypeFunctionReplaceItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPointListPrototypeFunctionRemoveItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPointListPrototypeFunctionAppendItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGPointListNumberOfItems(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPointListNumberOfItems(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPolygonElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPolygonElement.cpp index 15ccd91902..eed0da75ed 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPolygonElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPolygonElement.cpp @@ -54,7 +54,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPolygonElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPolygonElement); /* Hash table */ @@ -105,9 +105,9 @@ static const HashTable JSSVGPolygonElementPrototypeTable = const ClassInfo JSSVGPolygonElementPrototype::s_info = { "SVGPolygonElementPrototype", 0, &JSSVGPolygonElementPrototypeTable, 0 }; -JSObject* JSSVGPolygonElementPrototype::self(ExecState* exec) +JSObject* JSSVGPolygonElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPolygonElement>(exec); + return getDOMPrototype<JSSVGPolygonElement>(exec, globalObject); } bool JSSVGPolygonElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -122,9 +122,9 @@ JSSVGPolygonElement::JSSVGPolygonElement(PassRefPtr<Structure> structure, PassRe { } -JSObject* JSSVGPolygonElement::createPrototype(ExecState* exec) +JSObject* JSSVGPolygonElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPolygonElementPrototype(JSSVGPolygonElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGPolygonElementPrototype(JSSVGPolygonElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGPolygonElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -132,177 +132,196 @@ bool JSSVGPolygonElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGPolygonElement, Base>(exec, &JSSVGPolygonElementTable, this, propertyName, slot); } -JSValuePtr jsSVGPolygonElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolygonElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(static_cast<JSSVGPolygonElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGPolygonElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolygonElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(static_cast<JSSVGPolygonElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGPolygonElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolygonElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(static_cast<JSSVGPolygonElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGPolygonElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolygonElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(static_cast<JSSVGPolygonElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGPolygonElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolygonElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(static_cast<JSSVGPolygonElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGPolygonElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolygonElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(static_cast<JSSVGPolygonElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPolygonElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolygonElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(static_cast<JSSVGPolygonElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPolygonElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolygonElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(static_cast<JSSVGPolygonElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGPolygonElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolygonElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(static_cast<JSSVGPolygonElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->transformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPolygonElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolygonElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(static_cast<JSSVGPolygonElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGPolygonElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolygonElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(static_cast<JSSVGPolygonElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -JSValuePtr jsSVGPolygonElementPoints(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolygonElementPoints(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(static_cast<JSSVGPolygonElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->points()), imp); } -JSValuePtr jsSVGPolygonElementAnimatedPoints(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolygonElementAnimatedPoints(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(static_cast<JSSVGPolygonElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->animatedPoints()), imp); } -void JSSVGPolygonElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPolygonElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPolygonElement, Base>(exec, propertyName, value, &JSSVGPolygonElementTable, this, slot); } -void setJSSVGPolygonElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPolygonElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(static_cast<JSSVGPolygonElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGPolygonElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPolygonElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(static_cast<JSSVGPolygonElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGPolygonElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPolygonElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPolygonElement::s_info)) return throwError(exec, TypeError); JSSVGPolygonElement* castedThisObj = static_cast<JSSVGPolygonElement*>(asObject(thisValue)); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGPolygonElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPolygonElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPolygonElement::s_info)) return throwError(exec, TypeError); JSSVGPolygonElement* castedThisObj = static_cast<JSSVGPolygonElement*>(asObject(thisValue)); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } -JSValuePtr jsSVGPolygonElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPolygonElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPolygonElement::s_info)) return throwError(exec, TypeError); JSSVGPolygonElement* castedThisObj = static_cast<JSSVGPolygonElement*>(asObject(thisValue)); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGPolygonElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPolygonElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPolygonElement::s_info)) return throwError(exec, TypeError); JSSVGPolygonElement* castedThisObj = static_cast<JSSVGPolygonElement*>(asObject(thisValue)); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGPolygonElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPolygonElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPolygonElement::s_info)) return throwError(exec, TypeError); JSSVGPolygonElement* castedThisObj = static_cast<JSSVGPolygonElement*>(asObject(thisValue)); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGPolygonElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPolygonElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPolygonElement::s_info)) return throwError(exec, TypeError); JSSVGPolygonElement* castedThisObj = static_cast<JSSVGPolygonElement*>(asObject(thisValue)); SVGPolygonElement* imp = static_cast<SVGPolygonElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPolygonElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPolygonElement.h index f98722fd01..31fab27f53 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPolygonElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPolygonElement.h @@ -34,13 +34,13 @@ class JSSVGPolygonElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGPolygonElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPolygonElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGPolygonElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,29 +64,29 @@ public: // Functions -JSC::JSValuePtr jsSVGPolygonElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPolygonElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPolygonElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPolygonElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPolygonElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPolygonElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGPolygonElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolygonElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolygonElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolygonElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPolygonElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPolygonElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPolygonElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPolygonElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolygonElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolygonElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolygonElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolygonElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolygonElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolygonElementPoints(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolygonElementAnimatedPoints(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolygonElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolygonElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolygonElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolygonElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPolygonElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPolygonElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPolygonElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPolygonElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolygonElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolygonElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolygonElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolygonElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolygonElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolygonElementPoints(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolygonElementAnimatedPoints(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPolylineElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPolylineElement.cpp index 19fe95abc1..3dc8332db0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPolylineElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPolylineElement.cpp @@ -54,7 +54,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPolylineElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPolylineElement); /* Hash table */ @@ -105,9 +105,9 @@ static const HashTable JSSVGPolylineElementPrototypeTable = const ClassInfo JSSVGPolylineElementPrototype::s_info = { "SVGPolylineElementPrototype", 0, &JSSVGPolylineElementPrototypeTable, 0 }; -JSObject* JSSVGPolylineElementPrototype::self(ExecState* exec) +JSObject* JSSVGPolylineElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPolylineElement>(exec); + return getDOMPrototype<JSSVGPolylineElement>(exec, globalObject); } bool JSSVGPolylineElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -122,9 +122,9 @@ JSSVGPolylineElement::JSSVGPolylineElement(PassRefPtr<Structure> structure, Pass { } -JSObject* JSSVGPolylineElement::createPrototype(ExecState* exec) +JSObject* JSSVGPolylineElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPolylineElementPrototype(JSSVGPolylineElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGPolylineElementPrototype(JSSVGPolylineElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGPolylineElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -132,177 +132,196 @@ bool JSSVGPolylineElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGPolylineElement, Base>(exec, &JSSVGPolylineElementTable, this, propertyName, slot); } -JSValuePtr jsSVGPolylineElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolylineElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(static_cast<JSSVGPolylineElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGPolylineElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolylineElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(static_cast<JSSVGPolylineElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGPolylineElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolylineElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(static_cast<JSSVGPolylineElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGPolylineElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolylineElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(static_cast<JSSVGPolylineElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGPolylineElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolylineElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(static_cast<JSSVGPolylineElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGPolylineElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolylineElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(static_cast<JSSVGPolylineElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPolylineElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolylineElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(static_cast<JSSVGPolylineElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPolylineElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolylineElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(static_cast<JSSVGPolylineElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGPolylineElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolylineElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(static_cast<JSSVGPolylineElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->transformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGPolylineElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolylineElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(static_cast<JSSVGPolylineElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGPolylineElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolylineElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(static_cast<JSSVGPolylineElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -JSValuePtr jsSVGPolylineElementPoints(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolylineElementPoints(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(static_cast<JSSVGPolylineElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->points()), imp); } -JSValuePtr jsSVGPolylineElementAnimatedPoints(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPolylineElementAnimatedPoints(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(static_cast<JSSVGPolylineElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->animatedPoints()), imp); } -void JSSVGPolylineElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPolylineElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPolylineElement, Base>(exec, propertyName, value, &JSSVGPolylineElementTable, this, slot); } -void setJSSVGPolylineElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPolylineElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(static_cast<JSSVGPolylineElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGPolylineElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPolylineElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(static_cast<JSSVGPolylineElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGPolylineElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPolylineElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPolylineElement::s_info)) return throwError(exec, TypeError); JSSVGPolylineElement* castedThisObj = static_cast<JSSVGPolylineElement*>(asObject(thisValue)); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGPolylineElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPolylineElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPolylineElement::s_info)) return throwError(exec, TypeError); JSSVGPolylineElement* castedThisObj = static_cast<JSSVGPolylineElement*>(asObject(thisValue)); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } -JSValuePtr jsSVGPolylineElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPolylineElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPolylineElement::s_info)) return throwError(exec, TypeError); JSSVGPolylineElement* castedThisObj = static_cast<JSSVGPolylineElement*>(asObject(thisValue)); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGPolylineElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPolylineElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPolylineElement::s_info)) return throwError(exec, TypeError); JSSVGPolylineElement* castedThisObj = static_cast<JSSVGPolylineElement*>(asObject(thisValue)); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGPolylineElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPolylineElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPolylineElement::s_info)) return throwError(exec, TypeError); JSSVGPolylineElement* castedThisObj = static_cast<JSSVGPolylineElement*>(asObject(thisValue)); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGPolylineElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGPolylineElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGPolylineElement::s_info)) return throwError(exec, TypeError); JSSVGPolylineElement* castedThisObj = static_cast<JSSVGPolylineElement*>(asObject(thisValue)); SVGPolylineElement* imp = static_cast<SVGPolylineElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPolylineElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPolylineElement.h index 11f3cd4ddd..d20ea8bf16 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPolylineElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPolylineElement.h @@ -34,13 +34,13 @@ class JSSVGPolylineElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGPolylineElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPolylineElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGPolylineElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,29 +64,29 @@ public: // Functions -JSC::JSValuePtr jsSVGPolylineElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPolylineElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPolylineElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPolylineElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPolylineElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGPolylineElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGPolylineElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolylineElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolylineElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolylineElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPolylineElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPolylineElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPolylineElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPolylineElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolylineElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolylineElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolylineElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolylineElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolylineElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolylineElementPoints(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPolylineElementAnimatedPoints(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolylineElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolylineElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolylineElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolylineElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPolylineElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPolylineElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPolylineElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPolylineElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolylineElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolylineElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolylineElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolylineElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolylineElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolylineElementPoints(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPolylineElementAnimatedPoints(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPreserveAspectRatio.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPreserveAspectRatio.cpp index 4ddc1b9065..98c81798ee 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPreserveAspectRatio.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPreserveAspectRatio.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGPreserveAspectRatio) +ASSERT_CLASS_FITS_IN_CELL(JSSVGPreserveAspectRatio); /* Hash table */ @@ -88,13 +88,13 @@ public: JSSVGPreserveAspectRatioConstructor(ExecState* exec) : DOMObject(JSSVGPreserveAspectRatioConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGPreserveAspectRatioPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGPreserveAspectRatioPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -137,9 +137,9 @@ static const HashTable JSSVGPreserveAspectRatioPrototypeTable = const ClassInfo JSSVGPreserveAspectRatioPrototype::s_info = { "SVGPreserveAspectRatioPrototype", 0, &JSSVGPreserveAspectRatioPrototypeTable, 0 }; -JSObject* JSSVGPreserveAspectRatioPrototype::self(ExecState* exec) +JSObject* JSSVGPreserveAspectRatioPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGPreserveAspectRatio>(exec); + return getDOMPrototype<JSSVGPreserveAspectRatio>(exec, globalObject); } bool JSSVGPreserveAspectRatioPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -159,12 +159,11 @@ JSSVGPreserveAspectRatio::JSSVGPreserveAspectRatio(PassRefPtr<Structure> structu JSSVGPreserveAspectRatio::~JSSVGPreserveAspectRatio() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGPreserveAspectRatio::createPrototype(ExecState* exec) +JSObject* JSSVGPreserveAspectRatio::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGPreserveAspectRatioPrototype(JSSVGPreserveAspectRatioPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGPreserveAspectRatioPrototype(JSSVGPreserveAspectRatioPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGPreserveAspectRatio::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -172,127 +171,129 @@ bool JSSVGPreserveAspectRatio::getOwnPropertySlot(ExecState* exec, const Identif return getStaticValueSlot<JSSVGPreserveAspectRatio, Base>(exec, &JSSVGPreserveAspectRatioTable, this, propertyName, slot); } -JSValuePtr jsSVGPreserveAspectRatioAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPreserveAspectRatioAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPreserveAspectRatio* imp = static_cast<SVGPreserveAspectRatio*>(static_cast<JSSVGPreserveAspectRatio*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->align()); } -JSValuePtr jsSVGPreserveAspectRatioMeetOrSlice(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPreserveAspectRatioMeetOrSlice(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGPreserveAspectRatio* imp = static_cast<SVGPreserveAspectRatio*>(static_cast<JSSVGPreserveAspectRatio*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->meetOrSlice()); } -JSValuePtr jsSVGPreserveAspectRatioConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGPreserveAspectRatioConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGPreserveAspectRatio*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSSVGPreserveAspectRatio::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGPreserveAspectRatio::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGPreserveAspectRatio, Base>(exec, propertyName, value, &JSSVGPreserveAspectRatioTable, this, slot); } -void setJSSVGPreserveAspectRatioAlign(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPreserveAspectRatioAlign(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPreserveAspectRatio* imp = static_cast<SVGPreserveAspectRatio*>(static_cast<JSSVGPreserveAspectRatio*>(thisObject)->impl()); - imp->setAlign(value->toInt32(exec)); + imp->setAlign(value.toInt32(exec)); if (static_cast<JSSVGPreserveAspectRatio*>(thisObject)->context()) static_cast<JSSVGPreserveAspectRatio*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPreserveAspectRatio*>(thisObject)->impl()->associatedAttributeName()); } -void setJSSVGPreserveAspectRatioMeetOrSlice(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGPreserveAspectRatioMeetOrSlice(ExecState* exec, JSObject* thisObject, JSValue value) { SVGPreserveAspectRatio* imp = static_cast<SVGPreserveAspectRatio*>(static_cast<JSSVGPreserveAspectRatio*>(thisObject)->impl()); - imp->setMeetOrSlice(value->toInt32(exec)); + imp->setMeetOrSlice(value.toInt32(exec)); if (static_cast<JSSVGPreserveAspectRatio*>(thisObject)->context()) static_cast<JSSVGPreserveAspectRatio*>(thisObject)->context()->svgAttributeChanged(static_cast<JSSVGPreserveAspectRatio*>(thisObject)->impl()->associatedAttributeName()); } -JSValuePtr JSSVGPreserveAspectRatio::getConstructor(ExecState* exec) +JSValue JSSVGPreserveAspectRatio::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGPreserveAspectRatioConstructor>(exec); } // Constant getters -JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_NONE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_NONE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMINYMIN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMINYMIN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMIDYMIN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMIDYMIN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMAXYMIN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMAXYMIN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMINYMID(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMINYMID(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(5)); } -JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMIDYMID(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMIDYMID(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(6)); } -JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMAXYMID(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMAXYMID(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(7)); } -JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMINYMAX(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMINYMAX(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(8)); } -JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMIDYMAX(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMIDYMAX(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(9)); } -JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMAXYMAX(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMAXYMAX(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(10)); } -JSValuePtr jsSVGPreserveAspectRatioSVG_MEETORSLICE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPreserveAspectRatioSVG_MEETORSLICE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGPreserveAspectRatioSVG_MEETORSLICE_MEET(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPreserveAspectRatioSVG_MEETORSLICE_MEET(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGPreserveAspectRatioSVG_MEETORSLICE_SLICE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGPreserveAspectRatioSVG_MEETORSLICE_SLICE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGPreserveAspectRatio* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGPreserveAspectRatio* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGPreserveAspectRatio>(exec, object, context); } -SVGPreserveAspectRatio* toSVGPreserveAspectRatio(JSC::JSValuePtr value) +SVGPreserveAspectRatio* toSVGPreserveAspectRatio(JSC::JSValue value) { - return value->isObject(&JSSVGPreserveAspectRatio::s_info) ? static_cast<JSSVGPreserveAspectRatio*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGPreserveAspectRatio::s_info) ? static_cast<JSSVGPreserveAspectRatio*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPreserveAspectRatio.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPreserveAspectRatio.h index c16f2cee5f..6e92b5c980 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPreserveAspectRatio.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPreserveAspectRatio.h @@ -37,18 +37,18 @@ class JSSVGPreserveAspectRatio : public DOMObject { public: JSSVGPreserveAspectRatio(PassRefPtr<JSC::Structure>, PassRefPtr<SVGPreserveAspectRatio>, SVGElement* context); virtual ~JSSVGPreserveAspectRatio(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); SVGPreserveAspectRatio* impl() const { return m_impl.get(); } SVGElement* context() const { return m_context.get(); } @@ -57,16 +57,17 @@ private: RefPtr<SVGPreserveAspectRatio > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGPreserveAspectRatio*, SVGElement* context); -SVGPreserveAspectRatio* toSVGPreserveAspectRatio(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGPreserveAspectRatio*, SVGElement* context); +SVGPreserveAspectRatio* toSVGPreserveAspectRatio(JSC::JSValue); class JSSVGPreserveAspectRatioPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -75,27 +76,27 @@ public: // Attributes -JSC::JSValuePtr jsSVGPreserveAspectRatioAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPreserveAspectRatioAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPreserveAspectRatioMeetOrSlice(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGPreserveAspectRatioMeetOrSlice(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGPreserveAspectRatioConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPreserveAspectRatioAlign(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPreserveAspectRatioAlign(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPreserveAspectRatioMeetOrSlice(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGPreserveAspectRatioMeetOrSlice(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGPreserveAspectRatioConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_NONE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMINYMIN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMIDYMIN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMAXYMIN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMINYMID(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMIDYMID(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMAXYMID(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMINYMAX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMIDYMAX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMAXYMAX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPreserveAspectRatioSVG_MEETORSLICE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPreserveAspectRatioSVG_MEETORSLICE_MEET(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGPreserveAspectRatioSVG_MEETORSLICE_SLICE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_NONE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMINYMIN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMIDYMIN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMAXYMIN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMINYMID(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMIDYMID(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMAXYMID(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMINYMAX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMIDYMAX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPreserveAspectRatioSVG_PRESERVEASPECTRATIO_XMAXYMAX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPreserveAspectRatioSVG_MEETORSLICE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPreserveAspectRatioSVG_MEETORSLICE_MEET(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGPreserveAspectRatioSVG_MEETORSLICE_SLICE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGRadialGradientElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGRadialGradientElement.cpp index 309f66e9e3..cb7b87a01f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGRadialGradientElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGRadialGradientElement.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGRadialGradientElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGRadialGradientElement); /* Hash table */ @@ -73,9 +73,9 @@ static const HashTable JSSVGRadialGradientElementPrototypeTable = const ClassInfo JSSVGRadialGradientElementPrototype::s_info = { "SVGRadialGradientElementPrototype", 0, &JSSVGRadialGradientElementPrototypeTable, 0 }; -JSObject* JSSVGRadialGradientElementPrototype::self(ExecState* exec) +JSObject* JSSVGRadialGradientElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGRadialGradientElement>(exec); + return getDOMPrototype<JSSVGRadialGradientElement>(exec, globalObject); } const ClassInfo JSSVGRadialGradientElement::s_info = { "SVGRadialGradientElement", &JSSVGGradientElement::s_info, &JSSVGRadialGradientElementTable, 0 }; @@ -85,9 +85,9 @@ JSSVGRadialGradientElement::JSSVGRadialGradientElement(PassRefPtr<Structure> str { } -JSObject* JSSVGRadialGradientElement::createPrototype(ExecState* exec) +JSObject* JSSVGRadialGradientElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGRadialGradientElementPrototype(JSSVGRadialGradientElementPrototype::createStructure(JSSVGGradientElementPrototype::self(exec))); + return new (exec) JSSVGRadialGradientElementPrototype(JSSVGRadialGradientElementPrototype::createStructure(JSSVGGradientElementPrototype::self(exec, globalObject))); } bool JSSVGRadialGradientElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -95,36 +95,41 @@ bool JSSVGRadialGradientElement::getOwnPropertySlot(ExecState* exec, const Ident return getStaticValueSlot<JSSVGRadialGradientElement, Base>(exec, &JSSVGRadialGradientElementTable, this, propertyName, slot); } -JSValuePtr jsSVGRadialGradientElementCx(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRadialGradientElementCx(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRadialGradientElement* imp = static_cast<SVGRadialGradientElement*>(static_cast<JSSVGRadialGradientElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->cxAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGRadialGradientElementCy(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRadialGradientElementCy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRadialGradientElement* imp = static_cast<SVGRadialGradientElement*>(static_cast<JSSVGRadialGradientElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->cyAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGRadialGradientElementR(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRadialGradientElementR(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRadialGradientElement* imp = static_cast<SVGRadialGradientElement*>(static_cast<JSSVGRadialGradientElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->rAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGRadialGradientElementFx(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRadialGradientElementFx(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRadialGradientElement* imp = static_cast<SVGRadialGradientElement*>(static_cast<JSSVGRadialGradientElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->fxAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGRadialGradientElementFy(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRadialGradientElementFy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRadialGradientElement* imp = static_cast<SVGRadialGradientElement*>(static_cast<JSSVGRadialGradientElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->fyAnimated(); return toJS(exec, obj.get(), imp); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGRadialGradientElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGRadialGradientElement.h index e8f853e996..fdd7ce356e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGRadialGradientElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGRadialGradientElement.h @@ -34,12 +34,12 @@ class JSSVGRadialGradientElement : public JSSVGGradientElement { typedef JSSVGGradientElement Base; public: JSSVGRadialGradientElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGRadialGradientElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,8 +48,9 @@ public: class JSSVGRadialGradientElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGRadialGradientElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -57,11 +58,11 @@ public: // Attributes -JSC::JSValuePtr jsSVGRadialGradientElementCx(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRadialGradientElementCy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRadialGradientElementR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRadialGradientElementFx(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRadialGradientElementFy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRadialGradientElementCx(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRadialGradientElementCy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRadialGradientElementR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRadialGradientElementFx(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRadialGradientElementFy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGRect.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGRect.cpp index d343a68227..826dad5b98 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGRect.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGRect.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGRect) +ASSERT_CLASS_FITS_IN_CELL(JSSVGRect); /* Hash table */ @@ -71,9 +71,9 @@ static const HashTable JSSVGRectPrototypeTable = const ClassInfo JSSVGRectPrototype::s_info = { "SVGRectPrototype", 0, &JSSVGRectPrototypeTable, 0 }; -JSObject* JSSVGRectPrototype::self(ExecState* exec) +JSObject* JSSVGRectPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGRect>(exec); + return getDOMPrototype<JSSVGRect>(exec, globalObject); } const ClassInfo JSSVGRect::s_info = { "SVGRect", 0, &JSSVGRectTable, 0 }; @@ -89,12 +89,11 @@ JSSVGRect::~JSSVGRect() { JSSVGDynamicPODTypeWrapperCache<FloatRect, SVGAnimatedRect>::forgetWrapper(m_impl.get()); forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGRect::createPrototype(ExecState* exec) +JSObject* JSSVGRect::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGRectPrototype(JSSVGRectPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGRectPrototype(JSSVGRectPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGRect::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -102,70 +101,74 @@ bool JSSVGRect::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa return getStaticValueSlot<JSSVGRect, Base>(exec, &JSSVGRectTable, this, propertyName, slot); } -JSValuePtr jsSVGRectX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); FloatRect imp(*static_cast<JSSVGRect*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp.x()); } -JSValuePtr jsSVGRectY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); FloatRect imp(*static_cast<JSSVGRect*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp.y()); } -JSValuePtr jsSVGRectWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); FloatRect imp(*static_cast<JSSVGRect*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp.width()); } -JSValuePtr jsSVGRectHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); FloatRect imp(*static_cast<JSSVGRect*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp.height()); } -void JSSVGRect::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGRect::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGRect, Base>(exec, propertyName, value, &JSSVGRectTable, this, slot); } -void setJSSVGRectX(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGRectX(ExecState* exec, JSObject* thisObject, JSValue value) { FloatRect imp(*static_cast<JSSVGRect*>(thisObject)->impl()); - imp.setX(value->toFloat(exec)); + imp.setX(value.toFloat(exec)); static_cast<JSSVGRect*>(thisObject)->impl()->commitChange(imp, static_cast<JSSVGRect*>(thisObject)->context()); } -void setJSSVGRectY(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGRectY(ExecState* exec, JSObject* thisObject, JSValue value) { FloatRect imp(*static_cast<JSSVGRect*>(thisObject)->impl()); - imp.setY(value->toFloat(exec)); + imp.setY(value.toFloat(exec)); static_cast<JSSVGRect*>(thisObject)->impl()->commitChange(imp, static_cast<JSSVGRect*>(thisObject)->context()); } -void setJSSVGRectWidth(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGRectWidth(ExecState* exec, JSObject* thisObject, JSValue value) { FloatRect imp(*static_cast<JSSVGRect*>(thisObject)->impl()); - imp.setWidth(value->toFloat(exec)); + imp.setWidth(value.toFloat(exec)); static_cast<JSSVGRect*>(thisObject)->impl()->commitChange(imp, static_cast<JSSVGRect*>(thisObject)->context()); } -void setJSSVGRectHeight(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGRectHeight(ExecState* exec, JSObject* thisObject, JSValue value) { FloatRect imp(*static_cast<JSSVGRect*>(thisObject)->impl()); - imp.setHeight(value->toFloat(exec)); + imp.setHeight(value.toFloat(exec)); static_cast<JSSVGRect*>(thisObject)->impl()->commitChange(imp, static_cast<JSSVGRect*>(thisObject)->context()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper<FloatRect>* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper<FloatRect>* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGRect, JSSVGPODTypeWrapper<FloatRect> >(exec, object, context); } -FloatRect toSVGRect(JSC::JSValuePtr value) +FloatRect toSVGRect(JSC::JSValue value) { - return value->isObject(&JSSVGRect::s_info) ? (FloatRect) *static_cast<JSSVGRect*>(asObject(value))->impl() : FloatRect(); + return value.isObject(&JSSVGRect::s_info) ? (FloatRect) *static_cast<JSSVGRect*>(asObject(value))->impl() : FloatRect(); } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGRect.h b/src/3rdparty/webkit/WebCore/generated/JSSVGRect.h index 3e85f5de4e..0eefd7ce4f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGRect.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGRect.h @@ -37,13 +37,13 @@ class JSSVGRect : public DOMObject { public: JSSVGRect(PassRefPtr<JSC::Structure>, PassRefPtr<JSSVGPODTypeWrapper<FloatRect> >, SVGElement* context); virtual ~JSSVGRect(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -56,12 +56,13 @@ private: RefPtr<JSSVGPODTypeWrapper<FloatRect> > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, JSSVGPODTypeWrapper<FloatRect>*, SVGElement* context); -FloatRect toSVGRect(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, JSSVGPODTypeWrapper<FloatRect>*, SVGElement* context); +FloatRect toSVGRect(JSC::JSValue); class JSSVGRectPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGRectPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -69,14 +70,14 @@ public: // Attributes -JSC::JSValuePtr jsSVGRectX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGRectX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGRectY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGRectY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGRectWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGRectWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGRectHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGRectHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGRectX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGRectX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGRectY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGRectY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGRectWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGRectWidth(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGRectHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGRectHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGRectElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGRectElement.cpp index 6fac4c5731..d04e192b96 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGRectElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGRectElement.cpp @@ -53,7 +53,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGRectElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGRectElement); /* Hash table */ @@ -108,9 +108,9 @@ static const HashTable JSSVGRectElementPrototypeTable = const ClassInfo JSSVGRectElementPrototype::s_info = { "SVGRectElementPrototype", 0, &JSSVGRectElementPrototypeTable, 0 }; -JSObject* JSSVGRectElementPrototype::self(ExecState* exec) +JSObject* JSSVGRectElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGRectElement>(exec); + return getDOMPrototype<JSSVGRectElement>(exec, globalObject); } bool JSSVGRectElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -125,9 +125,9 @@ JSSVGRectElement::JSSVGRectElement(PassRefPtr<Structure> structure, PassRefPtr<S { } -JSObject* JSSVGRectElement::createPrototype(ExecState* exec) +JSObject* JSSVGRectElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGRectElementPrototype(JSSVGRectElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGRectElementPrototype(JSSVGRectElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGRectElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -135,207 +135,230 @@ bool JSSVGRectElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSSVGRectElement, Base>(exec, &JSSVGRectElementTable, this, propertyName, slot); } -JSValuePtr jsSVGRectElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGRectElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGRectElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGRectElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGRectElementRx(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementRx(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->rxAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGRectElementRy(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementRy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->ryAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGRectElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGRectElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGRectElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGRectElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGRectElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGRectElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGRectElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGRectElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGRectElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->transformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGRectElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGRectElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRectElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -void JSSVGRectElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGRectElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGRectElement, Base>(exec, propertyName, value, &JSSVGRectElementTable, this, slot); } -void setJSSVGRectElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGRectElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGRectElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGRectElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGRectElement* imp = static_cast<SVGRectElement*>(static_cast<JSSVGRectElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGRectElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGRectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGRectElement::s_info)) return throwError(exec, TypeError); JSSVGRectElement* castedThisObj = static_cast<JSSVGRectElement*>(asObject(thisValue)); SVGRectElement* imp = static_cast<SVGRectElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGRectElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGRectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGRectElement::s_info)) return throwError(exec, TypeError); JSSVGRectElement* castedThisObj = static_cast<JSSVGRectElement*>(asObject(thisValue)); SVGRectElement* imp = static_cast<SVGRectElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } -JSValuePtr jsSVGRectElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGRectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGRectElement::s_info)) return throwError(exec, TypeError); JSSVGRectElement* castedThisObj = static_cast<JSSVGRectElement*>(asObject(thisValue)); SVGRectElement* imp = static_cast<SVGRectElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGRectElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGRectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGRectElement::s_info)) return throwError(exec, TypeError); JSSVGRectElement* castedThisObj = static_cast<JSSVGRectElement*>(asObject(thisValue)); SVGRectElement* imp = static_cast<SVGRectElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGRectElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGRectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGRectElement::s_info)) return throwError(exec, TypeError); JSSVGRectElement* castedThisObj = static_cast<JSSVGRectElement*>(asObject(thisValue)); SVGRectElement* imp = static_cast<SVGRectElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGRectElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGRectElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGRectElement::s_info)) return throwError(exec, TypeError); JSSVGRectElement* castedThisObj = static_cast<JSSVGRectElement*>(asObject(thisValue)); SVGRectElement* imp = static_cast<SVGRectElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGRectElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGRectElement.h index f4bb5a9bcb..619f252d4b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGRectElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGRectElement.h @@ -34,13 +34,13 @@ class JSSVGRectElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGRectElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGRectElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGRectElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,33 +64,33 @@ public: // Functions -JSC::JSValuePtr jsSVGRectElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGRectElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGRectElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGRectElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGRectElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGRectElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGRectElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRectElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRectElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRectElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRectElementRx(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRectElementRy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRectElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRectElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRectElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRectElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGRectElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGRectElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGRectElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGRectElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRectElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRectElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRectElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRectElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRectElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRectElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRectElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRectElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRectElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRectElementRx(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRectElementRy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRectElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRectElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRectElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRectElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGRectElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGRectElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGRectElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGRectElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRectElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRectElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRectElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRectElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRectElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGRenderingIntent.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGRenderingIntent.cpp index e4f1ca4d69..d0c0223006 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGRenderingIntent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGRenderingIntent.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGRenderingIntent) +ASSERT_CLASS_FITS_IN_CELL(JSSVGRenderingIntent); /* Hash table */ @@ -78,13 +78,13 @@ public: JSSVGRenderingIntentConstructor(ExecState* exec) : DOMObject(JSSVGRenderingIntentConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGRenderingIntentPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGRenderingIntentPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -119,9 +119,9 @@ static const HashTable JSSVGRenderingIntentPrototypeTable = const ClassInfo JSSVGRenderingIntentPrototype::s_info = { "SVGRenderingIntentPrototype", 0, &JSSVGRenderingIntentPrototypeTable, 0 }; -JSObject* JSSVGRenderingIntentPrototype::self(ExecState* exec) +JSObject* JSSVGRenderingIntentPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGRenderingIntent>(exec); + return getDOMPrototype<JSSVGRenderingIntent>(exec, globalObject); } bool JSSVGRenderingIntentPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -141,12 +141,11 @@ JSSVGRenderingIntent::JSSVGRenderingIntent(PassRefPtr<Structure> structure, Pass JSSVGRenderingIntent::~JSSVGRenderingIntent() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGRenderingIntent::createPrototype(ExecState* exec) +JSObject* JSSVGRenderingIntent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGRenderingIntentPrototype(JSSVGRenderingIntentPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGRenderingIntentPrototype(JSSVGRenderingIntentPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGRenderingIntent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -154,54 +153,54 @@ bool JSSVGRenderingIntent::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGRenderingIntent, Base>(exec, &JSSVGRenderingIntentTable, this, propertyName, slot); } -JSValuePtr jsSVGRenderingIntentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGRenderingIntentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGRenderingIntent*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSSVGRenderingIntent::getConstructor(ExecState* exec) +JSValue JSSVGRenderingIntent::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGRenderingIntentConstructor>(exec); } // Constant getters -JSValuePtr jsSVGRenderingIntentRENDERING_INTENT_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGRenderingIntentRENDERING_INTENT_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGRenderingIntentRENDERING_INTENT_AUTO(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGRenderingIntentRENDERING_INTENT_AUTO(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGRenderingIntentRENDERING_INTENT_PERCEPTUAL(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGRenderingIntentRENDERING_INTENT_PERCEPTUAL(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGRenderingIntentRENDERING_INTENT_RELATIVE_COLORIMETRIC(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGRenderingIntentRENDERING_INTENT_RELATIVE_COLORIMETRIC(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsSVGRenderingIntentRENDERING_INTENT_SATURATION(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGRenderingIntentRENDERING_INTENT_SATURATION(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSValuePtr jsSVGRenderingIntentRENDERING_INTENT_ABSOLUTE_COLORIMETRIC(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGRenderingIntentRENDERING_INTENT_ABSOLUTE_COLORIMETRIC(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(5)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGRenderingIntent* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGRenderingIntent* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGRenderingIntent>(exec, object, context); } -SVGRenderingIntent* toSVGRenderingIntent(JSC::JSValuePtr value) +SVGRenderingIntent* toSVGRenderingIntent(JSC::JSValue value) { - return value->isObject(&JSSVGRenderingIntent::s_info) ? static_cast<JSSVGRenderingIntent*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGRenderingIntent::s_info) ? static_cast<JSSVGRenderingIntent*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGRenderingIntent.h b/src/3rdparty/webkit/WebCore/generated/JSSVGRenderingIntent.h index 9a60929281..14b8801191 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGRenderingIntent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGRenderingIntent.h @@ -37,17 +37,17 @@ class JSSVGRenderingIntent : public DOMObject { public: JSSVGRenderingIntent(PassRefPtr<JSC::Structure>, PassRefPtr<SVGRenderingIntent>, SVGElement* context); virtual ~JSSVGRenderingIntent(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); SVGRenderingIntent* impl() const { return m_impl.get(); } SVGElement* context() const { return m_context.get(); } @@ -56,16 +56,17 @@ private: RefPtr<SVGRenderingIntent > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGRenderingIntent*, SVGElement* context); -SVGRenderingIntent* toSVGRenderingIntent(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGRenderingIntent*, SVGElement* context); +SVGRenderingIntent* toSVGRenderingIntent(JSC::JSValue); class JSSVGRenderingIntentPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -74,15 +75,15 @@ public: // Attributes -JSC::JSValuePtr jsSVGRenderingIntentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRenderingIntentConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGRenderingIntentRENDERING_INTENT_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRenderingIntentRENDERING_INTENT_AUTO(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRenderingIntentRENDERING_INTENT_PERCEPTUAL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRenderingIntentRENDERING_INTENT_RELATIVE_COLORIMETRIC(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRenderingIntentRENDERING_INTENT_SATURATION(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGRenderingIntentRENDERING_INTENT_ABSOLUTE_COLORIMETRIC(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRenderingIntentRENDERING_INTENT_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRenderingIntentRENDERING_INTENT_AUTO(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRenderingIntentRENDERING_INTENT_PERCEPTUAL(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRenderingIntentRENDERING_INTENT_RELATIVE_COLORIMETRIC(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRenderingIntentRENDERING_INTENT_SATURATION(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGRenderingIntentRENDERING_INTENT_ABSOLUTE_COLORIMETRIC(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGSVGElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGSVGElement.cpp index f7dc4c23f4..39070b6c32 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGSVGElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGSVGElement.cpp @@ -67,7 +67,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGSVGElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGSVGElement); /* Hash table */ @@ -157,9 +157,9 @@ static const HashTable JSSVGSVGElementPrototypeTable = const ClassInfo JSSVGSVGElementPrototype::s_info = { "SVGSVGElementPrototype", 0, &JSSVGSVGElementPrototypeTable, 0 }; -JSObject* JSSVGSVGElementPrototype::self(ExecState* exec) +JSObject* JSSVGSVGElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGSVGElement>(exec); + return getDOMPrototype<JSSVGSVGElement>(exec, globalObject); } bool JSSVGSVGElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -174,9 +174,9 @@ JSSVGSVGElement::JSSVGSVGElement(PassRefPtr<Structure> structure, PassRefPtr<SVG { } -JSObject* JSSVGSVGElement::createPrototype(ExecState* exec) +JSObject* JSSVGSVGElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGSVGElementPrototype(JSSVGSVGElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGSVGElementPrototype(JSSVGSVGElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGSVGElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -184,253 +184,283 @@ bool JSSVGSVGElement::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSSVGSVGElement, Base>(exec, &JSSVGSVGElementTable, this, propertyName, slot); } -JSValuePtr jsSVGSVGElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGSVGElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGSVGElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGSVGElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGSVGElementContentScriptType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementContentScriptType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->contentScriptType()); } -JSValuePtr jsSVGSVGElementContentStyleType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementContentStyleType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->contentStyleType()); } -JSValuePtr jsSVGSVGElementViewport(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementViewport(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->viewport()).get(), imp); } -JSValuePtr jsSVGSVGElementPixelUnitToMillimeterX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementPixelUnitToMillimeterX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->pixelUnitToMillimeterX()); } -JSValuePtr jsSVGSVGElementPixelUnitToMillimeterY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementPixelUnitToMillimeterY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->pixelUnitToMillimeterY()); } -JSValuePtr jsSVGSVGElementScreenPixelToMillimeterX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementScreenPixelToMillimeterX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->screenPixelToMillimeterX()); } -JSValuePtr jsSVGSVGElementScreenPixelToMillimeterY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementScreenPixelToMillimeterY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->screenPixelToMillimeterY()); } -JSValuePtr jsSVGSVGElementUseCurrentView(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementUseCurrentView(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->useCurrentView()); } -JSValuePtr jsSVGSVGElementCurrentScale(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementCurrentScale(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->currentScale()); } -JSValuePtr jsSVGSVGElementCurrentTranslate(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementCurrentTranslate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, JSSVGStaticPODTypeWrapperWithParent<FloatPoint, SVGSVGElement>::create(imp, &SVGSVGElement::currentTranslate, &SVGSVGElement::setCurrentTranslate).get(), imp); } -JSValuePtr jsSVGSVGElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGSVGElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGSVGElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGSVGElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGSVGElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGSVGElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGSVGElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGSVGElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGSVGElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGSVGElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -JSValuePtr jsSVGSVGElementViewBox(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementViewBox(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedRect> obj = imp->viewBoxAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGSVGElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedPreserveAspectRatio> obj = imp->preserveAspectRatioAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGSVGElementZoomAndPan(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSVGElementZoomAndPan(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->zoomAndPan()); } -void JSSVGSVGElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGSVGElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGSVGElement, Base>(exec, propertyName, value, &JSSVGSVGElementTable, this, slot); } -void setJSSVGSVGElementContentScriptType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGSVGElementContentScriptType(ExecState* exec, JSObject* thisObject, JSValue value) { SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(thisObject)->impl()); - imp->setContentScriptType(value->toString(exec)); + imp->setContentScriptType(value.toString(exec)); } -void setJSSVGSVGElementContentStyleType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGSVGElementContentStyleType(ExecState* exec, JSObject* thisObject, JSValue value) { SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(thisObject)->impl()); - imp->setContentStyleType(value->toString(exec)); + imp->setContentStyleType(value.toString(exec)); } -void setJSSVGSVGElementUseCurrentView(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGSVGElementUseCurrentView(ExecState* exec, JSObject* thisObject, JSValue value) { SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(thisObject)->impl()); - imp->setUseCurrentView(value->toBoolean(exec)); + imp->setUseCurrentView(value.toBoolean(exec)); } -void setJSSVGSVGElementCurrentScale(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGSVGElementCurrentScale(ExecState* exec, JSObject* thisObject, JSValue value) { SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(thisObject)->impl()); - imp->setCurrentScale(value->toFloat(exec)); + imp->setCurrentScale(value.toFloat(exec)); } -void setJSSVGSVGElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGSVGElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGSVGElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGSVGElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -void setJSSVGSVGElementZoomAndPan(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGSVGElementZoomAndPan(ExecState* exec, JSObject* thisObject, JSValue value) { SVGSVGElement* imp = static_cast<SVGSVGElement*>(static_cast<JSSVGSVGElement*>(thisObject)->impl()); - imp->setZoomAndPan(value->toInt32(exec)); + imp->setZoomAndPan(value.toInt32(exec)); } -JSValuePtr jsSVGSVGElementPrototypeFunctionSuspendRedraw(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionSuspendRedraw(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - unsigned maxWaitMilliseconds = args.at(exec, 0)->toInt32(exec); + unsigned maxWaitMilliseconds = args.at(0).toInt32(exec); - JSC::JSValuePtr result = jsNumber(exec, imp->suspendRedraw(maxWaitMilliseconds)); + JSC::JSValue result = jsNumber(exec, imp->suspendRedraw(maxWaitMilliseconds)); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionUnsuspendRedraw(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionUnsuspendRedraw(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned suspendHandleId = args.at(exec, 0)->toInt32(exec); + unsigned suspendHandleId = args.at(0).toInt32(exec); imp->unsuspendRedraw(suspendHandleId, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsSVGSVGElementPrototypeFunctionUnsuspendRedrawAll(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionUnsuspendRedrawAll(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); @@ -439,9 +469,10 @@ JSValuePtr jsSVGSVGElementPrototypeFunctionUnsuspendRedrawAll(ExecState* exec, J return jsUndefined(); } -JSValuePtr jsSVGSVGElementPrototypeFunctionForceRedraw(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionForceRedraw(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); @@ -450,9 +481,10 @@ JSValuePtr jsSVGSVGElementPrototypeFunctionForceRedraw(ExecState* exec, JSObject return jsUndefined(); } -JSValuePtr jsSVGSVGElementPrototypeFunctionPauseAnimations(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionPauseAnimations(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); @@ -461,9 +493,10 @@ JSValuePtr jsSVGSVGElementPrototypeFunctionPauseAnimations(ExecState* exec, JSOb return jsUndefined(); } -JSValuePtr jsSVGSVGElementPrototypeFunctionUnpauseAnimations(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionUnpauseAnimations(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); @@ -472,101 +505,109 @@ JSValuePtr jsSVGSVGElementPrototypeFunctionUnpauseAnimations(ExecState* exec, JS return jsUndefined(); } -JSValuePtr jsSVGSVGElementPrototypeFunctionAnimationsPaused(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionAnimationsPaused(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsBoolean(imp->animationsPaused()); + JSC::JSValue result = jsBoolean(imp->animationsPaused()); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionGetCurrentTime(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetCurrentTime(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsNumber(exec, imp->getCurrentTime()); + JSC::JSValue result = jsNumber(exec, imp->getCurrentTime()); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionSetCurrentTime(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionSetCurrentTime(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - float seconds = args.at(exec, 0)->toFloat(exec); + float seconds = args.at(0).toFloat(exec); imp->setCurrentTime(seconds); return jsUndefined(); } -JSValuePtr jsSVGSVGElementPrototypeFunctionGetIntersectionList(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetIntersectionList(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - FloatRect rect = toSVGRect(args.at(exec, 0)); - SVGElement* referenceElement = toSVGElement(args.at(exec, 1)); + FloatRect rect = toSVGRect(args.at(0)); + SVGElement* referenceElement = toSVGElement(args.at(1)); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getIntersectionList(rect, referenceElement))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getIntersectionList(rect, referenceElement))); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionGetEnclosureList(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetEnclosureList(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - FloatRect rect = toSVGRect(args.at(exec, 0)); - SVGElement* referenceElement = toSVGElement(args.at(exec, 1)); + FloatRect rect = toSVGRect(args.at(0)); + SVGElement* referenceElement = toSVGElement(args.at(1)); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getEnclosureList(rect, referenceElement))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getEnclosureList(rect, referenceElement))); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionCheckIntersection(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCheckIntersection(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - SVGElement* element = toSVGElement(args.at(exec, 0)); - FloatRect rect = toSVGRect(args.at(exec, 1)); + SVGElement* element = toSVGElement(args.at(0)); + FloatRect rect = toSVGRect(args.at(1)); - JSC::JSValuePtr result = jsBoolean(imp->checkIntersection(element, rect)); + JSC::JSValue result = jsBoolean(imp->checkIntersection(element, rect)); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionCheckEnclosure(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCheckEnclosure(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - SVGElement* element = toSVGElement(args.at(exec, 0)); - FloatRect rect = toSVGRect(args.at(exec, 1)); + SVGElement* element = toSVGElement(args.at(0)); + FloatRect rect = toSVGRect(args.at(1)); - JSC::JSValuePtr result = jsBoolean(imp->checkEnclosure(element, rect)); + JSC::JSValue result = jsBoolean(imp->checkEnclosure(element, rect)); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionDeselectAll(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionDeselectAll(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); @@ -575,193 +616,207 @@ JSValuePtr jsSVGSVGElementPrototypeFunctionDeselectAll(ExecState* exec, JSObject return jsUndefined(); } -JSValuePtr jsSVGSVGElementPrototypeFunctionCreateSVGNumber(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGNumber(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<float>::create(imp->createSVGNumber()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<float>::create(imp->createSVGNumber()).get(), imp); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionCreateSVGLength(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGLength(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGLength>::create(imp->createSVGLength()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGLength>::create(imp->createSVGLength()).get(), imp); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionCreateSVGAngle(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGAngle(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createSVGAngle()), imp); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGAngle()), imp); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionCreateSVGPoint(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGPoint(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatPoint>::create(imp->createSVGPoint()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatPoint>::create(imp->createSVGPoint()).get(), imp); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionCreateSVGMatrix(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGMatrix(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->createSVGMatrix()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->createSVGMatrix()).get(), imp); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionCreateSVGRect(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGRect(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->createSVGRect()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->createSVGRect()).get(), imp); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionCreateSVGTransform(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGTransform(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGTransform>::create(imp->createSVGTransform()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGTransform>::create(imp->createSVGTransform()).get(), imp); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionCreateSVGTransformFromMatrix(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGTransformFromMatrix(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - TransformationMatrix matrix = toSVGMatrix(args.at(exec, 0)); + TransformationMatrix matrix = toSVGMatrix(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGTransform>::create(imp->createSVGTransformFromMatrix(matrix)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGTransform>::create(imp->createSVGTransformFromMatrix(matrix)).get(), imp); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGSVGElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSVGElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSVGElement::s_info)) return throwError(exec, TypeError); JSSVGSVGElement* castedThisObj = static_cast<JSSVGSVGElement*>(asObject(thisValue)); SVGSVGElement* imp = static_cast<SVGSVGElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } // Constant getters -JSValuePtr jsSVGSVGElementSVG_ZOOMANDPAN_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGSVGElementSVG_ZOOMANDPAN_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGSVGElementSVG_ZOOMANDPAN_DISABLE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGSVGElementSVG_ZOOMANDPAN_DISABLE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGSVGElementSVG_ZOOMANDPAN_MAGNIFY(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGSVGElementSVG_ZOOMANDPAN_MAGNIFY(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGSVGElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGSVGElement.h index 954c91e809..7365cdb89a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGSVGElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGSVGElement.h @@ -34,13 +34,13 @@ class JSSVGSVGElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGSVGElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGSVGElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGSVGElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,75 +64,75 @@ public: // Functions -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionSuspendRedraw(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionUnsuspendRedraw(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionUnsuspendRedrawAll(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionForceRedraw(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionPauseAnimations(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionUnpauseAnimations(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionAnimationsPaused(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionGetCurrentTime(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionSetCurrentTime(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionGetIntersectionList(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionGetEnclosureList(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionCheckIntersection(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionCheckEnclosure(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionDeselectAll(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionCreateSVGNumber(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionCreateSVGLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionCreateSVGAngle(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionCreateSVGPoint(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionCreateSVGMatrix(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionCreateSVGRect(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionCreateSVGTransform(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionCreateSVGTransformFromMatrix(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSVGElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionSuspendRedraw(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionUnsuspendRedraw(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionUnsuspendRedrawAll(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionForceRedraw(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionPauseAnimations(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionUnpauseAnimations(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionAnimationsPaused(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetCurrentTime(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionSetCurrentTime(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetIntersectionList(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetEnclosureList(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCheckIntersection(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCheckEnclosure(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionDeselectAll(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGNumber(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGAngle(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGPoint(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGMatrix(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGRect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGTransform(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGTransformFromMatrix(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGSVGElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementContentScriptType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGSVGElementContentScriptType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGSVGElementContentStyleType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGSVGElementContentStyleType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGSVGElementViewport(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementPixelUnitToMillimeterX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementPixelUnitToMillimeterY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementScreenPixelToMillimeterX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementScreenPixelToMillimeterY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementUseCurrentView(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGSVGElementUseCurrentView(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGSVGElementCurrentScale(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGSVGElementCurrentScale(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGSVGElementCurrentTranslate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGSVGElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGSVGElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGSVGElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGSVGElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementViewBox(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementPreserveAspectRatio(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementZoomAndPan(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGSVGElementZoomAndPan(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGSVGElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementContentScriptType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGSVGElementContentScriptType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGSVGElementContentStyleType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGSVGElementContentStyleType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGSVGElementViewport(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementPixelUnitToMillimeterX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementPixelUnitToMillimeterY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementScreenPixelToMillimeterX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementScreenPixelToMillimeterY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementUseCurrentView(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGSVGElementUseCurrentView(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGSVGElementCurrentScale(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGSVGElementCurrentScale(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGSVGElementCurrentTranslate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGSVGElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGSVGElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGSVGElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGSVGElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementViewBox(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementPreserveAspectRatio(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementZoomAndPan(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGSVGElementZoomAndPan(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); // Constants -JSC::JSValuePtr jsSVGSVGElementSVG_ZOOMANDPAN_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementSVG_ZOOMANDPAN_DISABLE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSVGElementSVG_ZOOMANDPAN_MAGNIFY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementSVG_ZOOMANDPAN_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementSVG_ZOOMANDPAN_DISABLE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSVGElementSVG_ZOOMANDPAN_MAGNIFY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGScriptElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGScriptElement.cpp index 0ebf20547d..fa85a4eccd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGScriptElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGScriptElement.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGScriptElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGScriptElement); /* Hash table */ @@ -74,9 +74,9 @@ static const HashTable JSSVGScriptElementPrototypeTable = const ClassInfo JSSVGScriptElementPrototype::s_info = { "SVGScriptElementPrototype", 0, &JSSVGScriptElementPrototypeTable, 0 }; -JSObject* JSSVGScriptElementPrototype::self(ExecState* exec) +JSObject* JSSVGScriptElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGScriptElement>(exec); + return getDOMPrototype<JSSVGScriptElement>(exec, globalObject); } const ClassInfo JSSVGScriptElement::s_info = { "SVGScriptElement", &JSSVGElement::s_info, &JSSVGScriptElementTable, 0 }; @@ -86,9 +86,9 @@ JSSVGScriptElement::JSSVGScriptElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSSVGScriptElement::createPrototype(ExecState* exec) +JSObject* JSSVGScriptElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGScriptElementPrototype(JSSVGScriptElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGScriptElementPrototype(JSSVGScriptElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGScriptElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -96,32 +96,35 @@ bool JSSVGScriptElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSSVGScriptElement, Base>(exec, &JSSVGScriptElementTable, this, propertyName, slot); } -JSValuePtr jsSVGScriptElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGScriptElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGScriptElement* imp = static_cast<SVGScriptElement*>(static_cast<JSSVGScriptElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsSVGScriptElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGScriptElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGScriptElement* imp = static_cast<SVGScriptElement*>(static_cast<JSSVGScriptElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->hrefAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGScriptElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGScriptElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGScriptElement* imp = static_cast<SVGScriptElement*>(static_cast<JSSVGScriptElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -void JSSVGScriptElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGScriptElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGScriptElement, Base>(exec, propertyName, value, &JSSVGScriptElementTable, this, slot); } -void setJSSVGScriptElementType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGScriptElementType(ExecState* exec, JSObject* thisObject, JSValue value) { SVGScriptElement* imp = static_cast<SVGScriptElement*>(static_cast<JSSVGScriptElement*>(thisObject)->impl()); imp->setType(valueToStringWithNullCheck(exec, value)); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGScriptElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGScriptElement.h index 9fdfc4d1b7..9bec458713 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGScriptElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGScriptElement.h @@ -34,13 +34,13 @@ class JSSVGScriptElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGScriptElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGScriptElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGScriptElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGScriptElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,10 +59,10 @@ public: // Attributes -JSC::JSValuePtr jsSVGScriptElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGScriptElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGScriptElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGScriptElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGScriptElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGScriptElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGScriptElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGScriptElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGSetElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGSetElement.cpp index 60b0259c62..781bc434c9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGSetElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGSetElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGSetElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGSetElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGSetElementPrototypeTable = const ClassInfo JSSVGSetElementPrototype::s_info = { "SVGSetElementPrototype", 0, &JSSVGSetElementPrototypeTable, 0 }; -JSObject* JSSVGSetElementPrototype::self(ExecState* exec) +JSObject* JSSVGSetElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGSetElement>(exec); + return getDOMPrototype<JSSVGSetElement>(exec, globalObject); } const ClassInfo JSSVGSetElement::s_info = { "SVGSetElement", &JSSVGAnimationElement::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGSetElement::JSSVGSetElement(PassRefPtr<Structure> structure, PassRefPtr<SVG { } -JSObject* JSSVGSetElement::createPrototype(ExecState* exec) +JSObject* JSSVGSetElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGSetElementPrototype(JSSVGSetElementPrototype::createStructure(JSSVGAnimationElementPrototype::self(exec))); + return new (exec) JSSVGSetElementPrototype(JSSVGSetElementPrototype::createStructure(JSSVGAnimationElementPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGSetElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGSetElement.h index 6d80905263..cdb65674c4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGSetElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGSetElement.h @@ -34,7 +34,7 @@ class JSSVGSetElement : public JSSVGAnimationElement { typedef JSSVGAnimationElement Base; public: JSSVGSetElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGSetElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGSetElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGSetElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGStopElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGStopElement.cpp index 92659da2d7..0d008283bb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGStopElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGStopElement.cpp @@ -43,7 +43,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGStopElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGStopElement); /* Hash table */ @@ -79,9 +79,9 @@ static const HashTable JSSVGStopElementPrototypeTable = const ClassInfo JSSVGStopElementPrototype::s_info = { "SVGStopElementPrototype", 0, &JSSVGStopElementPrototypeTable, 0 }; -JSObject* JSSVGStopElementPrototype::self(ExecState* exec) +JSObject* JSSVGStopElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGStopElement>(exec); + return getDOMPrototype<JSSVGStopElement>(exec, globalObject); } bool JSSVGStopElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -96,9 +96,9 @@ JSSVGStopElement::JSSVGStopElement(PassRefPtr<Structure> structure, PassRefPtr<S { } -JSObject* JSSVGStopElement::createPrototype(ExecState* exec) +JSObject* JSSVGStopElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGStopElementPrototype(JSSVGStopElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGStopElementPrototype(JSSVGStopElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGStopElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -106,36 +106,40 @@ bool JSSVGStopElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSSVGStopElement, Base>(exec, &JSSVGStopElementTable, this, propertyName, slot); } -JSValuePtr jsSVGStopElementOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGStopElementOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGStopElement* imp = static_cast<SVGStopElement*>(static_cast<JSSVGStopElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumber> obj = imp->offsetAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGStopElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGStopElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGStopElement* imp = static_cast<SVGStopElement*>(static_cast<JSSVGStopElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGStopElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGStopElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGStopElement* imp = static_cast<SVGStopElement*>(static_cast<JSSVGStopElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGStopElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGStopElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGStopElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGStopElement::s_info)) return throwError(exec, TypeError); JSSVGStopElement* castedThisObj = static_cast<JSSVGStopElement*>(asObject(thisValue)); SVGStopElement* imp = static_cast<SVGStopElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGStopElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGStopElement.h index 525d8bcc02..881d4766ad 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGStopElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGStopElement.h @@ -34,12 +34,12 @@ class JSSVGStopElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGStopElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGStopElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,12 +48,13 @@ public: class JSSVGStopElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -62,12 +63,12 @@ public: // Functions -JSC::JSValuePtr jsSVGStopElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGStopElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGStopElementOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGStopElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGStopElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGStopElementOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGStopElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGStopElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGStringList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGStringList.cpp index b8de1bf9b4..62a6b7be26 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGStringList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGStringList.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGStringList) +ASSERT_CLASS_FITS_IN_CELL(JSSVGStringList); /* Hash table */ @@ -79,9 +79,9 @@ static const HashTable JSSVGStringListPrototypeTable = const ClassInfo JSSVGStringListPrototype::s_info = { "SVGStringListPrototype", 0, &JSSVGStringListPrototypeTable, 0 }; -JSObject* JSSVGStringListPrototype::self(ExecState* exec) +JSObject* JSSVGStringListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGStringList>(exec); + return getDOMPrototype<JSSVGStringList>(exec, globalObject); } bool JSSVGStringListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -101,12 +101,11 @@ JSSVGStringList::JSSVGStringList(PassRefPtr<Structure> structure, PassRefPtr<SVG JSSVGStringList::~JSSVGStringList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGStringList::createPrototype(ExecState* exec) +JSObject* JSSVGStringList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGStringListPrototype(JSSVGStringListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGStringListPrototype(JSSVGStringListPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGStringList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -114,15 +113,17 @@ bool JSSVGStringList::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSSVGStringList, Base>(exec, &JSSVGStringListTable, this, propertyName, slot); } -JSValuePtr jsSVGStringListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGStringListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGStringList* imp = static_cast<SVGStringList*>(static_cast<JSSVGStringList*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->numberOfItems()); } -JSValuePtr jsSVGStringListPrototypeFunctionClear(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGStringListPrototypeFunctionClear(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGStringList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGStringList::s_info)) return throwError(exec, TypeError); JSSVGStringList* castedThisObj = static_cast<JSSVGStringList*>(asObject(thisValue)); SVGStringList* imp = static_cast<SVGStringList*>(castedThisObj->impl()); @@ -133,105 +134,111 @@ JSValuePtr jsSVGStringListPrototypeFunctionClear(ExecState* exec, JSObject*, JSV return jsUndefined(); } -JSValuePtr jsSVGStringListPrototypeFunctionInitialize(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGStringListPrototypeFunctionInitialize(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGStringList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGStringList::s_info)) return throwError(exec, TypeError); JSSVGStringList* castedThisObj = static_cast<JSSVGStringList*>(asObject(thisValue)); SVGStringList* imp = static_cast<SVGStringList*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& item = args.at(exec, 0)->toString(exec); + const UString& item = args.at(0).toString(exec); - JSC::JSValuePtr result = jsString(exec, imp->initialize(item, ec)); + JSC::JSValue result = jsString(exec, imp->initialize(item, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGStringListPrototypeFunctionGetItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGStringListPrototypeFunctionGetItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGStringList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGStringList::s_info)) return throwError(exec, TypeError); JSSVGStringList* castedThisObj = static_cast<JSSVGStringList*>(asObject(thisValue)); SVGStringList* imp = static_cast<SVGStringList*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = jsString(exec, imp->getItem(index, ec)); + JSC::JSValue result = jsString(exec, imp->getItem(index, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGStringListPrototypeFunctionInsertItemBefore(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGStringListPrototypeFunctionInsertItemBefore(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGStringList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGStringList::s_info)) return throwError(exec, TypeError); JSSVGStringList* castedThisObj = static_cast<JSSVGStringList*>(asObject(thisValue)); SVGStringList* imp = static_cast<SVGStringList*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& item = args.at(exec, 0)->toString(exec); - unsigned index = args.at(exec, 1)->toInt32(exec); + const UString& item = args.at(0).toString(exec); + unsigned index = args.at(1).toInt32(exec); - JSC::JSValuePtr result = jsString(exec, imp->insertItemBefore(item, index, ec)); + JSC::JSValue result = jsString(exec, imp->insertItemBefore(item, index, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGStringListPrototypeFunctionReplaceItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGStringListPrototypeFunctionReplaceItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGStringList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGStringList::s_info)) return throwError(exec, TypeError); JSSVGStringList* castedThisObj = static_cast<JSSVGStringList*>(asObject(thisValue)); SVGStringList* imp = static_cast<SVGStringList*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& item = args.at(exec, 0)->toString(exec); - unsigned index = args.at(exec, 1)->toInt32(exec); + const UString& item = args.at(0).toString(exec); + unsigned index = args.at(1).toInt32(exec); - JSC::JSValuePtr result = jsString(exec, imp->replaceItem(item, index, ec)); + JSC::JSValue result = jsString(exec, imp->replaceItem(item, index, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGStringListPrototypeFunctionRemoveItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGStringListPrototypeFunctionRemoveItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGStringList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGStringList::s_info)) return throwError(exec, TypeError); JSSVGStringList* castedThisObj = static_cast<JSSVGStringList*>(asObject(thisValue)); SVGStringList* imp = static_cast<SVGStringList*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = jsString(exec, imp->removeItem(index, ec)); + JSC::JSValue result = jsString(exec, imp->removeItem(index, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGStringListPrototypeFunctionAppendItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGStringListPrototypeFunctionAppendItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGStringList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGStringList::s_info)) return throwError(exec, TypeError); JSSVGStringList* castedThisObj = static_cast<JSSVGStringList*>(asObject(thisValue)); SVGStringList* imp = static_cast<SVGStringList*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& item = args.at(exec, 0)->toString(exec); + const UString& item = args.at(0).toString(exec); - JSC::JSValuePtr result = jsString(exec, imp->appendItem(item, ec)); + JSC::JSValue result = jsString(exec, imp->appendItem(item, ec)); setDOMException(exec, ec); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGStringList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGStringList* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGStringList>(exec, object, context); } -SVGStringList* toSVGStringList(JSC::JSValuePtr value) +SVGStringList* toSVGStringList(JSC::JSValue value) { - return value->isObject(&JSSVGStringList::s_info) ? static_cast<JSSVGStringList*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGStringList::s_info) ? static_cast<JSSVGStringList*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGStringList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGStringList.h index b909d62bc6..c3765a0463 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGStringList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGStringList.h @@ -37,12 +37,12 @@ class JSSVGStringList : public DOMObject { public: JSSVGStringList(PassRefPtr<JSC::Structure>, PassRefPtr<SVGStringList>, SVGElement* context); virtual ~JSSVGStringList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -55,16 +55,17 @@ private: RefPtr<SVGStringList > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGStringList*, SVGElement* context); -SVGStringList* toSVGStringList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGStringList*, SVGElement* context); +SVGStringList* toSVGStringList(JSC::JSValue); class JSSVGStringListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -73,16 +74,16 @@ public: // Functions -JSC::JSValuePtr jsSVGStringListPrototypeFunctionClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGStringListPrototypeFunctionInitialize(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGStringListPrototypeFunctionGetItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGStringListPrototypeFunctionInsertItemBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGStringListPrototypeFunctionReplaceItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGStringListPrototypeFunctionRemoveItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGStringListPrototypeFunctionAppendItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGStringListPrototypeFunctionClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGStringListPrototypeFunctionInitialize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGStringListPrototypeFunctionGetItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGStringListPrototypeFunctionInsertItemBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGStringListPrototypeFunctionReplaceItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGStringListPrototypeFunctionRemoveItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGStringListPrototypeFunctionAppendItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGStringListNumberOfItems(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGStringListNumberOfItems(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGStyleElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGStyleElement.cpp index e3b1210c7e..c1f88835cd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGStyleElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGStyleElement.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGStyleElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGStyleElement); /* Hash table */ @@ -73,9 +73,9 @@ static const HashTable JSSVGStyleElementPrototypeTable = const ClassInfo JSSVGStyleElementPrototype::s_info = { "SVGStyleElementPrototype", 0, &JSSVGStyleElementPrototypeTable, 0 }; -JSObject* JSSVGStyleElementPrototype::self(ExecState* exec) +JSObject* JSSVGStyleElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGStyleElement>(exec); + return getDOMPrototype<JSSVGStyleElement>(exec, globalObject); } const ClassInfo JSSVGStyleElement::s_info = { "SVGStyleElement", &JSSVGElement::s_info, &JSSVGStyleElementTable, 0 }; @@ -85,9 +85,9 @@ JSSVGStyleElement::JSSVGStyleElement(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSSVGStyleElement::createPrototype(ExecState* exec) +JSObject* JSSVGStyleElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGStyleElementPrototype(JSSVGStyleElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGStyleElementPrototype(JSSVGStyleElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGStyleElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -95,64 +95,68 @@ bool JSSVGStyleElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSSVGStyleElement, Base>(exec, &JSSVGStyleElementTable, this, propertyName, slot); } -JSValuePtr jsSVGStyleElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGStyleElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGStyleElement* imp = static_cast<SVGStyleElement*>(static_cast<JSSVGStyleElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGStyleElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGStyleElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGStyleElement* imp = static_cast<SVGStyleElement*>(static_cast<JSSVGStyleElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->type()); } -JSValuePtr jsSVGStyleElementMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGStyleElementMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGStyleElement* imp = static_cast<SVGStyleElement*>(static_cast<JSSVGStyleElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->media()); } -JSValuePtr jsSVGStyleElementTitle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGStyleElementTitle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGStyleElement* imp = static_cast<SVGStyleElement*>(static_cast<JSSVGStyleElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->title()); } -void JSSVGStyleElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGStyleElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGStyleElement, Base>(exec, propertyName, value, &JSSVGStyleElementTable, this, slot); } -void setJSSVGStyleElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGStyleElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGStyleElement* imp = static_cast<SVGStyleElement*>(static_cast<JSSVGStyleElement*>(thisObject)->impl()); ExceptionCode ec = 0; - imp->setXmlspace(value->toString(exec), ec); + imp->setXmlspace(value.toString(exec), ec); setDOMException(exec, ec); } -void setJSSVGStyleElementType(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGStyleElementType(ExecState* exec, JSObject* thisObject, JSValue value) { SVGStyleElement* imp = static_cast<SVGStyleElement*>(static_cast<JSSVGStyleElement*>(thisObject)->impl()); ExceptionCode ec = 0; - imp->setType(value->toString(exec), ec); + imp->setType(value.toString(exec), ec); setDOMException(exec, ec); } -void setJSSVGStyleElementMedia(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGStyleElementMedia(ExecState* exec, JSObject* thisObject, JSValue value) { SVGStyleElement* imp = static_cast<SVGStyleElement*>(static_cast<JSSVGStyleElement*>(thisObject)->impl()); ExceptionCode ec = 0; - imp->setMedia(value->toString(exec), ec); + imp->setMedia(value.toString(exec), ec); setDOMException(exec, ec); } -void setJSSVGStyleElementTitle(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGStyleElementTitle(ExecState* exec, JSObject* thisObject, JSValue value) { SVGStyleElement* imp = static_cast<SVGStyleElement*>(static_cast<JSSVGStyleElement*>(thisObject)->impl()); ExceptionCode ec = 0; - imp->setTitle(value->toString(exec), ec); + imp->setTitle(value.toString(exec), ec); setDOMException(exec, ec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGStyleElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGStyleElement.h index 80098df881..54832a1640 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGStyleElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGStyleElement.h @@ -34,13 +34,13 @@ class JSSVGStyleElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGStyleElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGStyleElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,8 +49,9 @@ public: class JSSVGStyleElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGStyleElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -58,14 +59,14 @@ public: // Attributes -JSC::JSValuePtr jsSVGStyleElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGStyleElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGStyleElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGStyleElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGStyleElementMedia(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGStyleElementMedia(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGStyleElementTitle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGStyleElementTitle(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGStyleElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGStyleElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGStyleElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGStyleElementType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGStyleElementMedia(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGStyleElementMedia(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGStyleElementTitle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGStyleElementTitle(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGSwitchElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGSwitchElement.cpp index 8771f722f3..baaf607ace 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGSwitchElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGSwitchElement.cpp @@ -52,7 +52,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGSwitchElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGSwitchElement); /* Hash table */ @@ -101,9 +101,9 @@ static const HashTable JSSVGSwitchElementPrototypeTable = const ClassInfo JSSVGSwitchElementPrototype::s_info = { "SVGSwitchElementPrototype", 0, &JSSVGSwitchElementPrototypeTable, 0 }; -JSObject* JSSVGSwitchElementPrototype::self(ExecState* exec) +JSObject* JSSVGSwitchElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGSwitchElement>(exec); + return getDOMPrototype<JSSVGSwitchElement>(exec, globalObject); } bool JSSVGSwitchElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -118,9 +118,9 @@ JSSVGSwitchElement::JSSVGSwitchElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSSVGSwitchElement::createPrototype(ExecState* exec) +JSObject* JSSVGSwitchElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGSwitchElementPrototype(JSSVGSwitchElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGSwitchElementPrototype(JSSVGSwitchElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGSwitchElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,165 +128,182 @@ bool JSSVGSwitchElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSSVGSwitchElement, Base>(exec, &JSSVGSwitchElementTable, this, propertyName, slot); } -JSValuePtr jsSVGSwitchElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSwitchElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(static_cast<JSSVGSwitchElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGSwitchElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSwitchElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(static_cast<JSSVGSwitchElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGSwitchElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSwitchElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(static_cast<JSSVGSwitchElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGSwitchElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSwitchElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(static_cast<JSSVGSwitchElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGSwitchElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSwitchElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(static_cast<JSSVGSwitchElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGSwitchElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSwitchElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(static_cast<JSSVGSwitchElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGSwitchElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSwitchElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(static_cast<JSSVGSwitchElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGSwitchElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSwitchElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(static_cast<JSSVGSwitchElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGSwitchElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSwitchElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(static_cast<JSSVGSwitchElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->transformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGSwitchElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSwitchElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(static_cast<JSSVGSwitchElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGSwitchElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSwitchElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(static_cast<JSSVGSwitchElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -void JSSVGSwitchElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGSwitchElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGSwitchElement, Base>(exec, propertyName, value, &JSSVGSwitchElementTable, this, slot); } -void setJSSVGSwitchElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGSwitchElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(static_cast<JSSVGSwitchElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGSwitchElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGSwitchElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(static_cast<JSSVGSwitchElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGSwitchElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSwitchElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSwitchElement::s_info)) return throwError(exec, TypeError); JSSVGSwitchElement* castedThisObj = static_cast<JSSVGSwitchElement*>(asObject(thisValue)); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGSwitchElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSwitchElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSwitchElement::s_info)) return throwError(exec, TypeError); JSSVGSwitchElement* castedThisObj = static_cast<JSSVGSwitchElement*>(asObject(thisValue)); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } -JSValuePtr jsSVGSwitchElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSwitchElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSwitchElement::s_info)) return throwError(exec, TypeError); JSSVGSwitchElement* castedThisObj = static_cast<JSSVGSwitchElement*>(asObject(thisValue)); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGSwitchElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSwitchElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSwitchElement::s_info)) return throwError(exec, TypeError); JSSVGSwitchElement* castedThisObj = static_cast<JSSVGSwitchElement*>(asObject(thisValue)); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGSwitchElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSwitchElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSwitchElement::s_info)) return throwError(exec, TypeError); JSSVGSwitchElement* castedThisObj = static_cast<JSSVGSwitchElement*>(asObject(thisValue)); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGSwitchElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSwitchElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSwitchElement::s_info)) return throwError(exec, TypeError); JSSVGSwitchElement* castedThisObj = static_cast<JSSVGSwitchElement*>(asObject(thisValue)); SVGSwitchElement* imp = static_cast<SVGSwitchElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGSwitchElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGSwitchElement.h index 567f8f9257..b6672f87ca 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGSwitchElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGSwitchElement.h @@ -34,13 +34,13 @@ class JSSVGSwitchElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGSwitchElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGSwitchElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGSwitchElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,27 +64,27 @@ public: // Functions -JSC::JSValuePtr jsSVGSwitchElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSwitchElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSwitchElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSwitchElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSwitchElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGSwitchElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGSwitchElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSwitchElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSwitchElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSwitchElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGSwitchElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGSwitchElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGSwitchElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGSwitchElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSwitchElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSwitchElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSwitchElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSwitchElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSwitchElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSwitchElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSwitchElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSwitchElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSwitchElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGSwitchElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGSwitchElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGSwitchElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGSwitchElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSwitchElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSwitchElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSwitchElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSwitchElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSwitchElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGSymbolElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGSymbolElement.cpp index 29a02d8136..232dff70b4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGSymbolElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGSymbolElement.cpp @@ -47,7 +47,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGSymbolElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGSymbolElement); /* Hash table */ @@ -87,9 +87,9 @@ static const HashTable JSSVGSymbolElementPrototypeTable = const ClassInfo JSSVGSymbolElementPrototype::s_info = { "SVGSymbolElementPrototype", 0, &JSSVGSymbolElementPrototypeTable, 0 }; -JSObject* JSSVGSymbolElementPrototype::self(ExecState* exec) +JSObject* JSSVGSymbolElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGSymbolElement>(exec); + return getDOMPrototype<JSSVGSymbolElement>(exec, globalObject); } bool JSSVGSymbolElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -104,9 +104,9 @@ JSSVGSymbolElement::JSSVGSymbolElement(PassRefPtr<Structure> structure, PassRefP { } -JSObject* JSSVGSymbolElement::createPrototype(ExecState* exec) +JSObject* JSSVGSymbolElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGSymbolElementPrototype(JSSVGSymbolElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGSymbolElementPrototype(JSSVGSymbolElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGSymbolElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -114,79 +114,87 @@ bool JSSVGSymbolElement::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSSVGSymbolElement, Base>(exec, &JSSVGSymbolElementTable, this, propertyName, slot); } -JSValuePtr jsSVGSymbolElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSymbolElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSymbolElement* imp = static_cast<SVGSymbolElement*>(static_cast<JSSVGSymbolElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGSymbolElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSymbolElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSymbolElement* imp = static_cast<SVGSymbolElement*>(static_cast<JSSVGSymbolElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGSymbolElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSymbolElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSymbolElement* imp = static_cast<SVGSymbolElement*>(static_cast<JSSVGSymbolElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGSymbolElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSymbolElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSymbolElement* imp = static_cast<SVGSymbolElement*>(static_cast<JSSVGSymbolElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGSymbolElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSymbolElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSymbolElement* imp = static_cast<SVGSymbolElement*>(static_cast<JSSVGSymbolElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGSymbolElementViewBox(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSymbolElementViewBox(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSymbolElement* imp = static_cast<SVGSymbolElement*>(static_cast<JSSVGSymbolElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedRect> obj = imp->viewBoxAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGSymbolElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGSymbolElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGSymbolElement* imp = static_cast<SVGSymbolElement*>(static_cast<JSSVGSymbolElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedPreserveAspectRatio> obj = imp->preserveAspectRatioAnimated(); return toJS(exec, obj.get(), imp); } -void JSSVGSymbolElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGSymbolElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGSymbolElement, Base>(exec, propertyName, value, &JSSVGSymbolElementTable, this, slot); } -void setJSSVGSymbolElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGSymbolElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGSymbolElement* imp = static_cast<SVGSymbolElement*>(static_cast<JSSVGSymbolElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGSymbolElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGSymbolElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGSymbolElement* imp = static_cast<SVGSymbolElement*>(static_cast<JSSVGSymbolElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGSymbolElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGSymbolElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGSymbolElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGSymbolElement::s_info)) return throwError(exec, TypeError); JSSVGSymbolElement* castedThisObj = static_cast<JSSVGSymbolElement*>(asObject(thisValue)); SVGSymbolElement* imp = static_cast<SVGSymbolElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGSymbolElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGSymbolElement.h index 3664319b28..4ba3e49e3e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGSymbolElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGSymbolElement.h @@ -34,13 +34,13 @@ class JSSVGSymbolElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGSymbolElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGSymbolElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGSymbolElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,18 +64,18 @@ public: // Functions -JSC::JSValuePtr jsSVGSymbolElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGSymbolElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGSymbolElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGSymbolElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGSymbolElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGSymbolElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGSymbolElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSymbolElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSymbolElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSymbolElementViewBox(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGSymbolElementPreserveAspectRatio(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSymbolElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGSymbolElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGSymbolElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGSymbolElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGSymbolElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSymbolElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSymbolElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSymbolElementViewBox(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGSymbolElementPreserveAspectRatio(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTRefElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTRefElement.cpp index cd38679f33..e924f95365 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTRefElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTRefElement.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGTRefElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGTRefElement); /* Hash table */ @@ -69,9 +69,9 @@ static const HashTable JSSVGTRefElementPrototypeTable = const ClassInfo JSSVGTRefElementPrototype::s_info = { "SVGTRefElementPrototype", 0, &JSSVGTRefElementPrototypeTable, 0 }; -JSObject* JSSVGTRefElementPrototype::self(ExecState* exec) +JSObject* JSSVGTRefElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGTRefElement>(exec); + return getDOMPrototype<JSSVGTRefElement>(exec, globalObject); } const ClassInfo JSSVGTRefElement::s_info = { "SVGTRefElement", &JSSVGTextPositioningElement::s_info, &JSSVGTRefElementTable, 0 }; @@ -81,9 +81,9 @@ JSSVGTRefElement::JSSVGTRefElement(PassRefPtr<Structure> structure, PassRefPtr<S { } -JSObject* JSSVGTRefElement::createPrototype(ExecState* exec) +JSObject* JSSVGTRefElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGTRefElementPrototype(JSSVGTRefElementPrototype::createStructure(JSSVGTextPositioningElementPrototype::self(exec))); + return new (exec) JSSVGTRefElementPrototype(JSSVGTRefElementPrototype::createStructure(JSSVGTextPositioningElementPrototype::self(exec, globalObject))); } bool JSSVGTRefElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -91,8 +91,9 @@ bool JSSVGTRefElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSSVGTRefElement, Base>(exec, &JSSVGTRefElementTable, this, propertyName, slot); } -JSValuePtr jsSVGTRefElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTRefElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTRefElement* imp = static_cast<SVGTRefElement*>(static_cast<JSSVGTRefElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->hrefAnimated(); return toJS(exec, obj.get(), imp); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTRefElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTRefElement.h index f9a648061e..de846e1e2c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTRefElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTRefElement.h @@ -34,12 +34,12 @@ class JSSVGTRefElement : public JSSVGTextPositioningElement { typedef JSSVGTextPositioningElement Base; public: JSSVGTRefElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGTRefElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,8 +48,9 @@ public: class JSSVGTRefElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGTRefElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -57,7 +58,7 @@ public: // Attributes -JSC::JSValuePtr jsSVGTRefElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTRefElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTSpanElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTSpanElement.cpp index b6519b055b..df3ecb5fe2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTSpanElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTSpanElement.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGTSpanElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGTSpanElement); /* Hash table for prototype */ @@ -53,9 +53,9 @@ static const HashTable JSSVGTSpanElementPrototypeTable = const ClassInfo JSSVGTSpanElementPrototype::s_info = { "SVGTSpanElementPrototype", 0, &JSSVGTSpanElementPrototypeTable, 0 }; -JSObject* JSSVGTSpanElementPrototype::self(ExecState* exec) +JSObject* JSSVGTSpanElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGTSpanElement>(exec); + return getDOMPrototype<JSSVGTSpanElement>(exec, globalObject); } const ClassInfo JSSVGTSpanElement::s_info = { "SVGTSpanElement", &JSSVGTextPositioningElement::s_info, 0, 0 }; @@ -65,9 +65,9 @@ JSSVGTSpanElement::JSSVGTSpanElement(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSSVGTSpanElement::createPrototype(ExecState* exec) +JSObject* JSSVGTSpanElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGTSpanElementPrototype(JSSVGTSpanElementPrototype::createStructure(JSSVGTextPositioningElementPrototype::self(exec))); + return new (exec) JSSVGTSpanElementPrototype(JSSVGTSpanElementPrototype::createStructure(JSSVGTextPositioningElementPrototype::self(exec, globalObject))); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTSpanElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTSpanElement.h index 56171322b2..ac0084a57c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTSpanElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTSpanElement.h @@ -34,7 +34,7 @@ class JSSVGTSpanElement : public JSSVGTextPositioningElement { typedef JSSVGTextPositioningElement Base; public: JSSVGTSpanElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGTSpanElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -42,8 +42,9 @@ public: class JSSVGTSpanElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGTSpanElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTextContentElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTextContentElement.cpp index 3150594713..e0a9011f1f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTextContentElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTextContentElement.cpp @@ -31,6 +31,7 @@ #include "CSSMutableStyleDeclaration.h" #include "CSSStyleDeclaration.h" #include "CSSValue.h" +#include "ExceptionCode.h" #include "FloatPoint.h" #include "JSCSSStyleDeclaration.h" #include "JSCSSValue.h" @@ -53,7 +54,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGTextContentElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGTextContentElement); /* Hash table */ @@ -102,13 +103,13 @@ public: JSSVGTextContentElementConstructor(ExecState* exec) : DOMObject(JSSVGTextContentElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGTextContentElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGTextContentElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -151,9 +152,9 @@ static const HashTable JSSVGTextContentElementPrototypeTable = const ClassInfo JSSVGTextContentElementPrototype::s_info = { "SVGTextContentElementPrototype", 0, &JSSVGTextContentElementPrototypeTable, 0 }; -JSObject* JSSVGTextContentElementPrototype::self(ExecState* exec) +JSObject* JSSVGTextContentElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGTextContentElement>(exec); + return getDOMPrototype<JSSVGTextContentElement>(exec, globalObject); } bool JSSVGTextContentElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -168,9 +169,9 @@ JSSVGTextContentElement::JSSVGTextContentElement(PassRefPtr<Structure> structure { } -JSObject* JSSVGTextContentElement::createPrototype(ExecState* exec) +JSObject* JSSVGTextContentElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGTextContentElementPrototype(JSSVGTextContentElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGTextContentElementPrototype(JSSVGTextContentElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGTextContentElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -178,263 +179,316 @@ bool JSSVGTextContentElement::getOwnPropertySlot(ExecState* exec, const Identifi return getStaticValueSlot<JSSVGTextContentElement, Base>(exec, &JSSVGTextContentElementTable, this, propertyName, slot); } -JSValuePtr jsSVGTextContentElementTextLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextContentElementTextLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(static_cast<JSSVGTextContentElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->textLengthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGTextContentElementLengthAdjust(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextContentElementLengthAdjust(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(static_cast<JSSVGTextContentElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->lengthAdjustAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGTextContentElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextContentElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(static_cast<JSSVGTextContentElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGTextContentElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextContentElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(static_cast<JSSVGTextContentElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGTextContentElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextContentElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(static_cast<JSSVGTextContentElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGTextContentElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextContentElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(static_cast<JSSVGTextContentElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGTextContentElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextContentElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(static_cast<JSSVGTextContentElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGTextContentElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextContentElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(static_cast<JSSVGTextContentElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGTextContentElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextContentElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(static_cast<JSSVGTextContentElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGTextContentElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextContentElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(static_cast<JSSVGTextContentElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGTextContentElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextContentElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGTextContentElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSSVGTextContentElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGTextContentElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGTextContentElement, Base>(exec, propertyName, value, &JSSVGTextContentElementTable, this, slot); } -void setJSSVGTextContentElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGTextContentElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(static_cast<JSSVGTextContentElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGTextContentElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGTextContentElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(static_cast<JSSVGTextContentElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr JSSVGTextContentElement::getConstructor(ExecState* exec) +JSValue JSSVGTextContentElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGTextContentElementConstructor>(exec); } -JSValuePtr jsSVGTextContentElementPrototypeFunctionGetNumberOfChars(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetNumberOfChars(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTextContentElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTextContentElement::s_info)) return throwError(exec, TypeError); JSSVGTextContentElement* castedThisObj = static_cast<JSSVGTextContentElement*>(asObject(thisValue)); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsNumber(exec, imp->getNumberOfChars()); + JSC::JSValue result = jsNumber(exec, imp->getNumberOfChars()); return result; } -JSValuePtr jsSVGTextContentElementPrototypeFunctionGetComputedTextLength(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetComputedTextLength(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTextContentElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTextContentElement::s_info)) return throwError(exec, TypeError); JSSVGTextContentElement* castedThisObj = static_cast<JSSVGTextContentElement*>(asObject(thisValue)); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsNumber(exec, imp->getComputedTextLength()); + JSC::JSValue result = jsNumber(exec, imp->getComputedTextLength()); return result; } -JSValuePtr jsSVGTextContentElementPrototypeFunctionGetSubStringLength(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetSubStringLength(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTextContentElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTextContentElement::s_info)) return throwError(exec, TypeError); JSSVGTextContentElement* castedThisObj = static_cast<JSSVGTextContentElement*>(asObject(thisValue)); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned offset = args.at(exec, 0)->toInt32(exec); - unsigned length = args.at(exec, 1)->toInt32(exec); + int offset = args.at(0).toInt32(exec); + if (offset < 0) { + setDOMException(exec, INDEX_SIZE_ERR); + return jsUndefined(); + } + int length = args.at(1).toInt32(exec); + if (length < 0) { + setDOMException(exec, INDEX_SIZE_ERR); + return jsUndefined(); + } - JSC::JSValuePtr result = jsNumber(exec, imp->getSubStringLength(offset, length, ec)); + JSC::JSValue result = jsNumber(exec, imp->getSubStringLength(offset, length, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGTextContentElementPrototypeFunctionGetStartPositionOfChar(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetStartPositionOfChar(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTextContentElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTextContentElement::s_info)) return throwError(exec, TypeError); JSSVGTextContentElement* castedThisObj = static_cast<JSSVGTextContentElement*>(asObject(thisValue)); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned offset = args.at(exec, 0)->toInt32(exec); + int offset = args.at(0).toInt32(exec); + if (offset < 0) { + setDOMException(exec, INDEX_SIZE_ERR); + return jsUndefined(); + } - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatPoint>::create(imp->getStartPositionOfChar(offset, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatPoint>::create(imp->getStartPositionOfChar(offset, ec)).get(), imp); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGTextContentElementPrototypeFunctionGetEndPositionOfChar(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetEndPositionOfChar(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTextContentElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTextContentElement::s_info)) return throwError(exec, TypeError); JSSVGTextContentElement* castedThisObj = static_cast<JSSVGTextContentElement*>(asObject(thisValue)); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned offset = args.at(exec, 0)->toInt32(exec); + int offset = args.at(0).toInt32(exec); + if (offset < 0) { + setDOMException(exec, INDEX_SIZE_ERR); + return jsUndefined(); + } - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatPoint>::create(imp->getEndPositionOfChar(offset, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatPoint>::create(imp->getEndPositionOfChar(offset, ec)).get(), imp); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGTextContentElementPrototypeFunctionGetExtentOfChar(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetExtentOfChar(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTextContentElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTextContentElement::s_info)) return throwError(exec, TypeError); JSSVGTextContentElement* castedThisObj = static_cast<JSSVGTextContentElement*>(asObject(thisValue)); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned offset = args.at(exec, 0)->toInt32(exec); + int offset = args.at(0).toInt32(exec); + if (offset < 0) { + setDOMException(exec, INDEX_SIZE_ERR); + return jsUndefined(); + } - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getExtentOfChar(offset, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getExtentOfChar(offset, ec)).get(), imp); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGTextContentElementPrototypeFunctionGetRotationOfChar(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetRotationOfChar(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTextContentElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTextContentElement::s_info)) return throwError(exec, TypeError); JSSVGTextContentElement* castedThisObj = static_cast<JSSVGTextContentElement*>(asObject(thisValue)); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned offset = args.at(exec, 0)->toInt32(exec); + int offset = args.at(0).toInt32(exec); + if (offset < 0) { + setDOMException(exec, INDEX_SIZE_ERR); + return jsUndefined(); + } - JSC::JSValuePtr result = jsNumber(exec, imp->getRotationOfChar(offset, ec)); + JSC::JSValue result = jsNumber(exec, imp->getRotationOfChar(offset, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsSVGTextContentElementPrototypeFunctionGetCharNumAtPosition(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetCharNumAtPosition(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTextContentElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTextContentElement::s_info)) return throwError(exec, TypeError); JSSVGTextContentElement* castedThisObj = static_cast<JSSVGTextContentElement*>(asObject(thisValue)); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(castedThisObj->impl()); - FloatPoint point = toSVGPoint(args.at(exec, 0)); + FloatPoint point = toSVGPoint(args.at(0)); - JSC::JSValuePtr result = jsNumber(exec, imp->getCharNumAtPosition(point)); + JSC::JSValue result = jsNumber(exec, imp->getCharNumAtPosition(point)); return result; } -JSValuePtr jsSVGTextContentElementPrototypeFunctionSelectSubString(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionSelectSubString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTextContentElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTextContentElement::s_info)) return throwError(exec, TypeError); JSSVGTextContentElement* castedThisObj = static_cast<JSSVGTextContentElement*>(asObject(thisValue)); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned offset = args.at(exec, 0)->toInt32(exec); - unsigned length = args.at(exec, 1)->toInt32(exec); + int offset = args.at(0).toInt32(exec); + if (offset < 0) { + setDOMException(exec, INDEX_SIZE_ERR); + return jsUndefined(); + } + int length = args.at(1).toInt32(exec); + if (length < 0) { + setDOMException(exec, INDEX_SIZE_ERR); + return jsUndefined(); + } imp->selectSubString(offset, length, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsSVGTextContentElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTextContentElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTextContentElement::s_info)) return throwError(exec, TypeError); JSSVGTextContentElement* castedThisObj = static_cast<JSSVGTextContentElement*>(asObject(thisValue)); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGTextContentElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTextContentElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTextContentElement::s_info)) return throwError(exec, TypeError); JSSVGTextContentElement* castedThisObj = static_cast<JSSVGTextContentElement*>(asObject(thisValue)); SVGTextContentElement* imp = static_cast<SVGTextContentElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } // Constant getters -JSValuePtr jsSVGTextContentElementLENGTHADJUST_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGTextContentElementLENGTHADJUST_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGTextContentElementLENGTHADJUST_SPACING(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGTextContentElementLENGTHADJUST_SPACING(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGTextContentElementLENGTHADJUST_SPACINGANDGLYPHS(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGTextContentElementLENGTHADJUST_SPACINGANDGLYPHS(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTextContentElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTextContentElement.h index 8a5b85e3d8..af1b388f1d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTextContentElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTextContentElement.h @@ -34,28 +34,29 @@ class JSSVGTextContentElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGTextContentElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGTextContentElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSSVGTextContentElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -64,37 +65,37 @@ public: // Functions -JSC::JSValuePtr jsSVGTextContentElementPrototypeFunctionGetNumberOfChars(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTextContentElementPrototypeFunctionGetComputedTextLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTextContentElementPrototypeFunctionGetSubStringLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTextContentElementPrototypeFunctionGetStartPositionOfChar(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTextContentElementPrototypeFunctionGetEndPositionOfChar(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTextContentElementPrototypeFunctionGetExtentOfChar(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTextContentElementPrototypeFunctionGetRotationOfChar(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTextContentElementPrototypeFunctionGetCharNumAtPosition(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTextContentElementPrototypeFunctionSelectSubString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTextContentElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTextContentElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetNumberOfChars(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetComputedTextLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetSubStringLength(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetStartPositionOfChar(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetEndPositionOfChar(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetExtentOfChar(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetRotationOfChar(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetCharNumAtPosition(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionSelectSubString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGTextContentElementTextLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextContentElementLengthAdjust(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextContentElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextContentElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextContentElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextContentElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGTextContentElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGTextContentElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGTextContentElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGTextContentElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextContentElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextContentElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextContentElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextContentElementTextLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextContentElementLengthAdjust(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextContentElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextContentElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextContentElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextContentElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGTextContentElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGTextContentElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGTextContentElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGTextContentElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextContentElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextContentElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextContentElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGTextContentElementLENGTHADJUST_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextContentElementLENGTHADJUST_SPACING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextContentElementLENGTHADJUST_SPACINGANDGLYPHS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextContentElementLENGTHADJUST_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextContentElementLENGTHADJUST_SPACING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextContentElementLENGTHADJUST_SPACINGANDGLYPHS(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTextElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTextElement.cpp index 50612ff2fd..acf8ecf190 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTextElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTextElement.cpp @@ -41,7 +41,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGTextElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGTextElement); /* Hash table */ @@ -80,9 +80,9 @@ static const HashTable JSSVGTextElementPrototypeTable = const ClassInfo JSSVGTextElementPrototype::s_info = { "SVGTextElementPrototype", 0, &JSSVGTextElementPrototypeTable, 0 }; -JSObject* JSSVGTextElementPrototype::self(ExecState* exec) +JSObject* JSSVGTextElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGTextElement>(exec); + return getDOMPrototype<JSSVGTextElement>(exec, globalObject); } bool JSSVGTextElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -97,9 +97,9 @@ JSSVGTextElement::JSSVGTextElement(PassRefPtr<Structure> structure, PassRefPtr<S { } -JSObject* JSSVGTextElement::createPrototype(ExecState* exec) +JSObject* JSSVGTextElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGTextElementPrototype(JSSVGTextElementPrototype::createStructure(JSSVGTextPositioningElementPrototype::self(exec))); + return new (exec) JSSVGTextElementPrototype(JSSVGTextElementPrototype::createStructure(JSSVGTextPositioningElementPrototype::self(exec, globalObject))); } bool JSSVGTextElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -107,72 +107,79 @@ bool JSSVGTextElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSSVGTextElement, Base>(exec, &JSSVGTextElementTable, this, propertyName, slot); } -JSValuePtr jsSVGTextElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextElement* imp = static_cast<SVGTextElement*>(static_cast<JSSVGTextElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->transformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGTextElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextElement* imp = static_cast<SVGTextElement*>(static_cast<JSSVGTextElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGTextElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextElement* imp = static_cast<SVGTextElement*>(static_cast<JSSVGTextElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -JSValuePtr jsSVGTextElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTextElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTextElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTextElement::s_info)) return throwError(exec, TypeError); JSSVGTextElement* castedThisObj = static_cast<JSSVGTextElement*>(asObject(thisValue)); SVGTextElement* imp = static_cast<SVGTextElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGTextElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTextElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTextElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTextElement::s_info)) return throwError(exec, TypeError); JSSVGTextElement* castedThisObj = static_cast<JSSVGTextElement*>(asObject(thisValue)); SVGTextElement* imp = static_cast<SVGTextElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGTextElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTextElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTextElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTextElement::s_info)) return throwError(exec, TypeError); JSSVGTextElement* castedThisObj = static_cast<JSSVGTextElement*>(asObject(thisValue)); SVGTextElement* imp = static_cast<SVGTextElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGTextElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTextElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTextElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTextElement::s_info)) return throwError(exec, TypeError); JSSVGTextElement* castedThisObj = static_cast<JSSVGTextElement*>(asObject(thisValue)); SVGTextElement* imp = static_cast<SVGTextElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTextElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTextElement.h index 34169ace7a..05d4d7c920 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTextElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTextElement.h @@ -34,12 +34,12 @@ class JSSVGTextElement : public JSSVGTextPositioningElement { typedef JSSVGTextPositioningElement Base; public: JSSVGTextElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGTextElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,12 +48,13 @@ public: class JSSVGTextElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -62,15 +63,15 @@ public: // Functions -JSC::JSValuePtr jsSVGTextElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTextElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTextElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTextElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTextElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTextElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTextElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTextElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGTextElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTextPathElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTextPathElement.cpp index 48d1eef154..a324e0e9b6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTextPathElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTextPathElement.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGTextPathElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGTextPathElement); /* Hash table */ @@ -85,13 +85,13 @@ public: JSSVGTextPathElementConstructor(ExecState* exec) : DOMObject(JSSVGTextPathElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGTextPathElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGTextPathElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -126,9 +126,9 @@ static const HashTable JSSVGTextPathElementPrototypeTable = const ClassInfo JSSVGTextPathElementPrototype::s_info = { "SVGTextPathElementPrototype", 0, &JSSVGTextPathElementPrototypeTable, 0 }; -JSObject* JSSVGTextPathElementPrototype::self(ExecState* exec) +JSObject* JSSVGTextPathElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGTextPathElement>(exec); + return getDOMPrototype<JSSVGTextPathElement>(exec, globalObject); } bool JSSVGTextPathElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -143,9 +143,9 @@ JSSVGTextPathElement::JSSVGTextPathElement(PassRefPtr<Structure> structure, Pass { } -JSObject* JSSVGTextPathElement::createPrototype(ExecState* exec) +JSObject* JSSVGTextPathElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGTextPathElementPrototype(JSSVGTextPathElementPrototype::createStructure(JSSVGTextContentElementPrototype::self(exec))); + return new (exec) JSSVGTextPathElementPrototype(JSSVGTextPathElementPrototype::createStructure(JSSVGTextContentElementPrototype::self(exec, globalObject))); } bool JSSVGTextPathElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -153,71 +153,75 @@ bool JSSVGTextPathElement::getOwnPropertySlot(ExecState* exec, const Identifier& return getStaticValueSlot<JSSVGTextPathElement, Base>(exec, &JSSVGTextPathElementTable, this, propertyName, slot); } -JSValuePtr jsSVGTextPathElementStartOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextPathElementStartOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextPathElement* imp = static_cast<SVGTextPathElement*>(static_cast<JSSVGTextPathElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->startOffsetAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGTextPathElementMethod(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextPathElementMethod(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextPathElement* imp = static_cast<SVGTextPathElement*>(static_cast<JSSVGTextPathElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->methodAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGTextPathElementSpacing(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextPathElementSpacing(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextPathElement* imp = static_cast<SVGTextPathElement*>(static_cast<JSSVGTextPathElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedEnumeration> obj = imp->spacingAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGTextPathElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextPathElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextPathElement* imp = static_cast<SVGTextPathElement*>(static_cast<JSSVGTextPathElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->hrefAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGTextPathElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextPathElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGTextPathElement*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSSVGTextPathElement::getConstructor(ExecState* exec) +JSValue JSSVGTextPathElement::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGTextPathElementConstructor>(exec); } // Constant getters -JSValuePtr jsSVGTextPathElementTEXTPATH_METHODTYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGTextPathElementTEXTPATH_METHODTYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGTextPathElementTEXTPATH_METHODTYPE_ALIGN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGTextPathElementTEXTPATH_METHODTYPE_ALIGN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGTextPathElementTEXTPATH_METHODTYPE_STRETCH(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGTextPathElementTEXTPATH_METHODTYPE_STRETCH(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGTextPathElementTEXTPATH_SPACINGTYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGTextPathElementTEXTPATH_SPACINGTYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGTextPathElementTEXTPATH_SPACINGTYPE_AUTO(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGTextPathElementTEXTPATH_SPACINGTYPE_AUTO(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGTextPathElementTEXTPATH_SPACINGTYPE_EXACT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGTextPathElementTEXTPATH_SPACINGTYPE_EXACT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTextPathElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTextPathElement.h index fc2dd9b785..50ad156ac6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTextPathElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTextPathElement.h @@ -34,27 +34,28 @@ class JSSVGTextPathElement : public JSSVGTextContentElement { typedef JSSVGTextContentElement Base; public: JSSVGTextPathElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGTextPathElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSSVGTextPathElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,19 +64,19 @@ public: // Attributes -JSC::JSValuePtr jsSVGTextPathElementStartOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextPathElementMethod(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextPathElementSpacing(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextPathElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextPathElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextPathElementStartOffset(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextPathElementMethod(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextPathElementSpacing(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextPathElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextPathElementConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGTextPathElementTEXTPATH_METHODTYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextPathElementTEXTPATH_METHODTYPE_ALIGN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextPathElementTEXTPATH_METHODTYPE_STRETCH(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextPathElementTEXTPATH_SPACINGTYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextPathElementTEXTPATH_SPACINGTYPE_AUTO(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextPathElementTEXTPATH_SPACINGTYPE_EXACT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextPathElementTEXTPATH_METHODTYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextPathElementTEXTPATH_METHODTYPE_ALIGN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextPathElementTEXTPATH_METHODTYPE_STRETCH(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextPathElementTEXTPATH_SPACINGTYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextPathElementTEXTPATH_SPACINGTYPE_AUTO(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextPathElementTEXTPATH_SPACINGTYPE_EXACT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTextPositioningElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTextPositioningElement.cpp index b3860461c6..b8929cf703 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTextPositioningElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTextPositioningElement.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGTextPositioningElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGTextPositioningElement); /* Hash table */ @@ -74,9 +74,9 @@ static const HashTable JSSVGTextPositioningElementPrototypeTable = const ClassInfo JSSVGTextPositioningElementPrototype::s_info = { "SVGTextPositioningElementPrototype", 0, &JSSVGTextPositioningElementPrototypeTable, 0 }; -JSObject* JSSVGTextPositioningElementPrototype::self(ExecState* exec) +JSObject* JSSVGTextPositioningElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGTextPositioningElement>(exec); + return getDOMPrototype<JSSVGTextPositioningElement>(exec, globalObject); } const ClassInfo JSSVGTextPositioningElement::s_info = { "SVGTextPositioningElement", &JSSVGTextContentElement::s_info, &JSSVGTextPositioningElementTable, 0 }; @@ -86,9 +86,9 @@ JSSVGTextPositioningElement::JSSVGTextPositioningElement(PassRefPtr<Structure> s { } -JSObject* JSSVGTextPositioningElement::createPrototype(ExecState* exec) +JSObject* JSSVGTextPositioningElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGTextPositioningElementPrototype(JSSVGTextPositioningElementPrototype::createStructure(JSSVGTextContentElementPrototype::self(exec))); + return new (exec) JSSVGTextPositioningElementPrototype(JSSVGTextPositioningElementPrototype::createStructure(JSSVGTextContentElementPrototype::self(exec, globalObject))); } bool JSSVGTextPositioningElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -96,36 +96,41 @@ bool JSSVGTextPositioningElement::getOwnPropertySlot(ExecState* exec, const Iden return getStaticValueSlot<JSSVGTextPositioningElement, Base>(exec, &JSSVGTextPositioningElementTable, this, propertyName, slot); } -JSValuePtr jsSVGTextPositioningElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextPositioningElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextPositioningElement* imp = static_cast<SVGTextPositioningElement*>(static_cast<JSSVGTextPositioningElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLengthList> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGTextPositioningElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextPositioningElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextPositioningElement* imp = static_cast<SVGTextPositioningElement*>(static_cast<JSSVGTextPositioningElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLengthList> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGTextPositioningElementDx(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextPositioningElementDx(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextPositioningElement* imp = static_cast<SVGTextPositioningElement*>(static_cast<JSSVGTextPositioningElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLengthList> obj = imp->dxAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGTextPositioningElementDy(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextPositioningElementDy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextPositioningElement* imp = static_cast<SVGTextPositioningElement*>(static_cast<JSSVGTextPositioningElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLengthList> obj = imp->dyAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGTextPositioningElementRotate(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTextPositioningElementRotate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTextPositioningElement* imp = static_cast<SVGTextPositioningElement*>(static_cast<JSSVGTextPositioningElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedNumberList> obj = imp->rotateAnimated(); return toJS(exec, obj.get(), imp); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTextPositioningElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTextPositioningElement.h index 4dab3a26af..e3a09d4714 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTextPositioningElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTextPositioningElement.h @@ -34,12 +34,12 @@ class JSSVGTextPositioningElement : public JSSVGTextContentElement { typedef JSSVGTextContentElement Base; public: JSSVGTextPositioningElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGTextPositioningElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,8 +48,9 @@ public: class JSSVGTextPositioningElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGTextPositioningElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -57,11 +58,11 @@ public: // Attributes -JSC::JSValuePtr jsSVGTextPositioningElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextPositioningElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextPositioningElementDx(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextPositioningElementDy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTextPositioningElementRotate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextPositioningElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextPositioningElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextPositioningElementDx(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextPositioningElementDy(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTextPositioningElementRotate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTitleElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTitleElement.cpp index e443a78c8f..ac43471678 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTitleElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTitleElement.cpp @@ -44,7 +44,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGTitleElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGTitleElement); /* Hash table */ @@ -81,9 +81,9 @@ static const HashTable JSSVGTitleElementPrototypeTable = const ClassInfo JSSVGTitleElementPrototype::s_info = { "SVGTitleElementPrototype", 0, &JSSVGTitleElementPrototypeTable, 0 }; -JSObject* JSSVGTitleElementPrototype::self(ExecState* exec) +JSObject* JSSVGTitleElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGTitleElement>(exec); + return getDOMPrototype<JSSVGTitleElement>(exec, globalObject); } bool JSSVGTitleElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -98,9 +98,9 @@ JSSVGTitleElement::JSSVGTitleElement(PassRefPtr<Structure> structure, PassRefPtr { } -JSObject* JSSVGTitleElement::createPrototype(ExecState* exec) +JSObject* JSSVGTitleElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGTitleElementPrototype(JSSVGTitleElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGTitleElementPrototype(JSSVGTitleElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGTitleElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -108,58 +108,63 @@ bool JSSVGTitleElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSSVGTitleElement, Base>(exec, &JSSVGTitleElementTable, this, propertyName, slot); } -JSValuePtr jsSVGTitleElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTitleElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTitleElement* imp = static_cast<SVGTitleElement*>(static_cast<JSSVGTitleElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGTitleElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTitleElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTitleElement* imp = static_cast<SVGTitleElement*>(static_cast<JSSVGTitleElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGTitleElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTitleElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTitleElement* imp = static_cast<SVGTitleElement*>(static_cast<JSSVGTitleElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGTitleElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTitleElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTitleElement* imp = static_cast<SVGTitleElement*>(static_cast<JSSVGTitleElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -void JSSVGTitleElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGTitleElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGTitleElement, Base>(exec, propertyName, value, &JSSVGTitleElementTable, this, slot); } -void setJSSVGTitleElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGTitleElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGTitleElement* imp = static_cast<SVGTitleElement*>(static_cast<JSSVGTitleElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGTitleElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGTitleElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGTitleElement* imp = static_cast<SVGTitleElement*>(static_cast<JSSVGTitleElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGTitleElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTitleElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTitleElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTitleElement::s_info)) return throwError(exec, TypeError); JSSVGTitleElement* castedThisObj = static_cast<JSSVGTitleElement*>(asObject(thisValue)); SVGTitleElement* imp = static_cast<SVGTitleElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTitleElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTitleElement.h index a4ee478fad..6f52ca4ad3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTitleElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTitleElement.h @@ -34,13 +34,13 @@ class JSSVGTitleElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGTitleElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGTitleElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGTitleElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,15 +64,15 @@ public: // Functions -JSC::JSValuePtr jsSVGTitleElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTitleElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGTitleElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGTitleElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGTitleElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGTitleElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGTitleElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTitleElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTitleElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGTitleElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGTitleElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGTitleElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGTitleElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTitleElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTransform.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTransform.cpp index 6dbbfbe81b..b5de63eb45 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTransform.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTransform.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGTransform) +ASSERT_CLASS_FITS_IN_CELL(JSSVGTransform); /* Hash table */ @@ -84,13 +84,13 @@ public: JSSVGTransformConstructor(ExecState* exec) : DOMObject(JSSVGTransformConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGTransformPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGTransformPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -132,9 +132,9 @@ static const HashTable JSSVGTransformPrototypeTable = const ClassInfo JSSVGTransformPrototype::s_info = { "SVGTransformPrototype", 0, &JSSVGTransformPrototypeTable, 0 }; -JSObject* JSSVGTransformPrototype::self(ExecState* exec) +JSObject* JSSVGTransformPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGTransform>(exec); + return getDOMPrototype<JSSVGTransform>(exec, globalObject); } bool JSSVGTransformPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -154,12 +154,11 @@ JSSVGTransform::JSSVGTransform(PassRefPtr<Structure> structure, PassRefPtr<JSSVG JSSVGTransform::~JSSVGTransform() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGTransform::createPrototype(ExecState* exec) +JSObject* JSSVGTransform::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGTransformPrototype(JSSVGTransformPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGTransformPrototype(JSSVGTransformPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGTransform::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -167,115 +166,124 @@ bool JSSVGTransform::getOwnPropertySlot(ExecState* exec, const Identifier& prope return getStaticValueSlot<JSSVGTransform, Base>(exec, &JSSVGTransformTable, this, propertyName, slot); } -JSValuePtr jsSVGTransformType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTransformType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTransform imp(*static_cast<JSSVGTransform*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp.type()); } -JSValuePtr jsSVGTransformMatrix(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTransformMatrix(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTransform imp(*static_cast<JSSVGTransform*>(asObject(slot.slotBase()))->impl()); return toJS(exec, JSSVGStaticPODTypeWrapperWithPODTypeParent<TransformationMatrix, SVGTransform>::create(imp.matrix(), static_cast<JSSVGTransform*>(asObject(slot.slotBase()))->impl()).get(), static_cast<JSSVGTransform*>(asObject(slot.slotBase()))->context()); } -JSValuePtr jsSVGTransformAngle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTransformAngle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTransform imp(*static_cast<JSSVGTransform*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp.angle()); } -JSValuePtr jsSVGTransformConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTransformConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGTransform*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSSVGTransform::getConstructor(ExecState* exec) +JSValue JSSVGTransform::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGTransformConstructor>(exec); } -JSValuePtr jsSVGTransformPrototypeFunctionSetMatrix(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTransformPrototypeFunctionSetMatrix(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTransform::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTransform::s_info)) return throwError(exec, TypeError); JSSVGTransform* castedThisObj = static_cast<JSSVGTransform*>(asObject(thisValue)); JSSVGPODTypeWrapper<SVGTransform>* wrapper = castedThisObj->impl(); SVGTransform imp(*wrapper); - TransformationMatrix matrix = toSVGMatrix(args.at(exec, 0)); + TransformationMatrix matrix = toSVGMatrix(args.at(0)); imp.setMatrix(matrix); wrapper->commitChange(imp, castedThisObj->context()); return jsUndefined(); } -JSValuePtr jsSVGTransformPrototypeFunctionSetTranslate(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTransformPrototypeFunctionSetTranslate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTransform::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTransform::s_info)) return throwError(exec, TypeError); JSSVGTransform* castedThisObj = static_cast<JSSVGTransform*>(asObject(thisValue)); JSSVGPODTypeWrapper<SVGTransform>* wrapper = castedThisObj->impl(); SVGTransform imp(*wrapper); - float tx = args.at(exec, 0)->toFloat(exec); - float ty = args.at(exec, 1)->toFloat(exec); + float tx = args.at(0).toFloat(exec); + float ty = args.at(1).toFloat(exec); imp.setTranslate(tx, ty); wrapper->commitChange(imp, castedThisObj->context()); return jsUndefined(); } -JSValuePtr jsSVGTransformPrototypeFunctionSetScale(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTransformPrototypeFunctionSetScale(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTransform::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTransform::s_info)) return throwError(exec, TypeError); JSSVGTransform* castedThisObj = static_cast<JSSVGTransform*>(asObject(thisValue)); JSSVGPODTypeWrapper<SVGTransform>* wrapper = castedThisObj->impl(); SVGTransform imp(*wrapper); - float sx = args.at(exec, 0)->toFloat(exec); - float sy = args.at(exec, 1)->toFloat(exec); + float sx = args.at(0).toFloat(exec); + float sy = args.at(1).toFloat(exec); imp.setScale(sx, sy); wrapper->commitChange(imp, castedThisObj->context()); return jsUndefined(); } -JSValuePtr jsSVGTransformPrototypeFunctionSetRotate(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTransformPrototypeFunctionSetRotate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTransform::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTransform::s_info)) return throwError(exec, TypeError); JSSVGTransform* castedThisObj = static_cast<JSSVGTransform*>(asObject(thisValue)); JSSVGPODTypeWrapper<SVGTransform>* wrapper = castedThisObj->impl(); SVGTransform imp(*wrapper); - float angle = args.at(exec, 0)->toFloat(exec); - float cx = args.at(exec, 1)->toFloat(exec); - float cy = args.at(exec, 2)->toFloat(exec); + float angle = args.at(0).toFloat(exec); + float cx = args.at(1).toFloat(exec); + float cy = args.at(2).toFloat(exec); imp.setRotate(angle, cx, cy); wrapper->commitChange(imp, castedThisObj->context()); return jsUndefined(); } -JSValuePtr jsSVGTransformPrototypeFunctionSetSkewX(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTransformPrototypeFunctionSetSkewX(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTransform::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTransform::s_info)) return throwError(exec, TypeError); JSSVGTransform* castedThisObj = static_cast<JSSVGTransform*>(asObject(thisValue)); JSSVGPODTypeWrapper<SVGTransform>* wrapper = castedThisObj->impl(); SVGTransform imp(*wrapper); - float angle = args.at(exec, 0)->toFloat(exec); + float angle = args.at(0).toFloat(exec); imp.setSkewX(angle); wrapper->commitChange(imp, castedThisObj->context()); return jsUndefined(); } -JSValuePtr jsSVGTransformPrototypeFunctionSetSkewY(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTransformPrototypeFunctionSetSkewY(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTransform::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTransform::s_info)) return throwError(exec, TypeError); JSSVGTransform* castedThisObj = static_cast<JSSVGTransform*>(asObject(thisValue)); JSSVGPODTypeWrapper<SVGTransform>* wrapper = castedThisObj->impl(); SVGTransform imp(*wrapper); - float angle = args.at(exec, 0)->toFloat(exec); + float angle = args.at(0).toFloat(exec); imp.setSkewY(angle); wrapper->commitChange(imp, castedThisObj->context()); @@ -284,48 +292,48 @@ JSValuePtr jsSVGTransformPrototypeFunctionSetSkewY(ExecState* exec, JSObject*, J // Constant getters -JSValuePtr jsSVGTransformSVG_TRANSFORM_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGTransformSVG_TRANSFORM_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGTransformSVG_TRANSFORM_MATRIX(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGTransformSVG_TRANSFORM_MATRIX(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGTransformSVG_TRANSFORM_TRANSLATE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGTransformSVG_TRANSFORM_TRANSLATE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsSVGTransformSVG_TRANSFORM_SCALE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGTransformSVG_TRANSFORM_SCALE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsSVGTransformSVG_TRANSFORM_ROTATE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGTransformSVG_TRANSFORM_ROTATE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSValuePtr jsSVGTransformSVG_TRANSFORM_SKEWX(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGTransformSVG_TRANSFORM_SKEWX(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(5)); } -JSValuePtr jsSVGTransformSVG_TRANSFORM_SKEWY(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGTransformSVG_TRANSFORM_SKEWY(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(6)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper<SVGTransform>* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper<SVGTransform>* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGTransform, JSSVGPODTypeWrapper<SVGTransform> >(exec, object, context); } -SVGTransform toSVGTransform(JSC::JSValuePtr value) +SVGTransform toSVGTransform(JSC::JSValue value) { - return value->isObject(&JSSVGTransform::s_info) ? (SVGTransform) *static_cast<JSSVGTransform*>(asObject(value))->impl() : SVGTransform(); + return value.isObject(&JSSVGTransform::s_info) ? (SVGTransform) *static_cast<JSSVGTransform*>(asObject(value))->impl() : SVGTransform(); } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTransform.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTransform.h index 39cdf990ab..75d7723850 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTransform.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTransform.h @@ -37,17 +37,17 @@ class JSSVGTransform : public DOMObject { public: JSSVGTransform(PassRefPtr<JSC::Structure>, PassRefPtr<JSSVGPODTypeWrapper<SVGTransform> >, SVGElement* context); virtual ~JSSVGTransform(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); JSSVGPODTypeWrapper<SVGTransform>* impl() const { return m_impl.get(); } SVGElement* context() const { return m_context.get(); } @@ -56,16 +56,17 @@ private: RefPtr<JSSVGPODTypeWrapper<SVGTransform> > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, JSSVGPODTypeWrapper<SVGTransform>*, SVGElement* context); -SVGTransform toSVGTransform(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, JSSVGPODTypeWrapper<SVGTransform>*, SVGElement* context); +SVGTransform toSVGTransform(JSC::JSValue); class JSSVGTransformPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -74,27 +75,27 @@ public: // Functions -JSC::JSValuePtr jsSVGTransformPrototypeFunctionSetMatrix(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTransformPrototypeFunctionSetTranslate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTransformPrototypeFunctionSetScale(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTransformPrototypeFunctionSetRotate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTransformPrototypeFunctionSetSkewX(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTransformPrototypeFunctionSetSkewY(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTransformPrototypeFunctionSetMatrix(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTransformPrototypeFunctionSetTranslate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTransformPrototypeFunctionSetScale(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTransformPrototypeFunctionSetRotate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTransformPrototypeFunctionSetSkewX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTransformPrototypeFunctionSetSkewY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGTransformType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTransformMatrix(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTransformAngle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTransformConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTransformType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTransformMatrix(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTransformAngle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTransformConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGTransformSVG_TRANSFORM_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTransformSVG_TRANSFORM_MATRIX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTransformSVG_TRANSFORM_TRANSLATE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTransformSVG_TRANSFORM_SCALE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTransformSVG_TRANSFORM_ROTATE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTransformSVG_TRANSFORM_SKEWX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGTransformSVG_TRANSFORM_SKEWY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTransformSVG_TRANSFORM_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTransformSVG_TRANSFORM_MATRIX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTransformSVG_TRANSFORM_TRANSLATE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTransformSVG_TRANSFORM_SCALE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTransformSVG_TRANSFORM_ROTATE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTransformSVG_TRANSFORM_SKEWX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTransformSVG_TRANSFORM_SKEWY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTransformList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTransformList.cpp index 37871c29de..0459516c85 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTransformList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTransformList.cpp @@ -40,7 +40,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGTransformList) +ASSERT_CLASS_FITS_IN_CELL(JSSVGTransformList); /* Hash table */ @@ -82,9 +82,9 @@ static const HashTable JSSVGTransformListPrototypeTable = const ClassInfo JSSVGTransformListPrototype::s_info = { "SVGTransformListPrototype", 0, &JSSVGTransformListPrototypeTable, 0 }; -JSObject* JSSVGTransformListPrototype::self(ExecState* exec) +JSObject* JSSVGTransformListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGTransformList>(exec); + return getDOMPrototype<JSSVGTransformList>(exec, globalObject); } bool JSSVGTransformListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -104,12 +104,11 @@ JSSVGTransformList::JSSVGTransformList(PassRefPtr<Structure> structure, PassRefP JSSVGTransformList::~JSSVGTransformList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGTransformList::createPrototype(ExecState* exec) +JSObject* JSSVGTransformList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGTransformListPrototype(JSSVGTransformListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGTransformListPrototype(JSSVGTransformListPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGTransformList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -117,100 +116,110 @@ bool JSSVGTransformList::getOwnPropertySlot(ExecState* exec, const Identifier& p return getStaticValueSlot<JSSVGTransformList, Base>(exec, &JSSVGTransformListTable, this, propertyName, slot); } -JSValuePtr jsSVGTransformListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGTransformListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGTransformList* imp = static_cast<SVGTransformList*>(static_cast<JSSVGTransformList*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->numberOfItems()); } -JSValuePtr jsSVGTransformListPrototypeFunctionClear(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionClear(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTransformList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTransformList::s_info)) return throwError(exec, TypeError); JSSVGTransformList* castedThisObj = static_cast<JSSVGTransformList*>(asObject(thisValue)); return castedThisObj->clear(exec, args); } -JSValuePtr jsSVGTransformListPrototypeFunctionInitialize(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionInitialize(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTransformList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTransformList::s_info)) return throwError(exec, TypeError); JSSVGTransformList* castedThisObj = static_cast<JSSVGTransformList*>(asObject(thisValue)); return castedThisObj->initialize(exec, args); } -JSValuePtr jsSVGTransformListPrototypeFunctionGetItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionGetItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTransformList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTransformList::s_info)) return throwError(exec, TypeError); JSSVGTransformList* castedThisObj = static_cast<JSSVGTransformList*>(asObject(thisValue)); return castedThisObj->getItem(exec, args); } -JSValuePtr jsSVGTransformListPrototypeFunctionInsertItemBefore(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionInsertItemBefore(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTransformList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTransformList::s_info)) return throwError(exec, TypeError); JSSVGTransformList* castedThisObj = static_cast<JSSVGTransformList*>(asObject(thisValue)); return castedThisObj->insertItemBefore(exec, args); } -JSValuePtr jsSVGTransformListPrototypeFunctionReplaceItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionReplaceItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTransformList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTransformList::s_info)) return throwError(exec, TypeError); JSSVGTransformList* castedThisObj = static_cast<JSSVGTransformList*>(asObject(thisValue)); return castedThisObj->replaceItem(exec, args); } -JSValuePtr jsSVGTransformListPrototypeFunctionRemoveItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionRemoveItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTransformList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTransformList::s_info)) return throwError(exec, TypeError); JSSVGTransformList* castedThisObj = static_cast<JSSVGTransformList*>(asObject(thisValue)); return castedThisObj->removeItem(exec, args); } -JSValuePtr jsSVGTransformListPrototypeFunctionAppendItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionAppendItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTransformList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTransformList::s_info)) return throwError(exec, TypeError); JSSVGTransformList* castedThisObj = static_cast<JSSVGTransformList*>(asObject(thisValue)); return castedThisObj->appendItem(exec, args); } -JSValuePtr jsSVGTransformListPrototypeFunctionCreateSVGTransformFromMatrix(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionCreateSVGTransformFromMatrix(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTransformList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTransformList::s_info)) return throwError(exec, TypeError); JSSVGTransformList* castedThisObj = static_cast<JSSVGTransformList*>(asObject(thisValue)); SVGTransformList* imp = static_cast<SVGTransformList*>(castedThisObj->impl()); - TransformationMatrix matrix = toSVGMatrix(args.at(exec, 0)); + TransformationMatrix matrix = toSVGMatrix(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGTransform>::create(imp->createSVGTransformFromMatrix(matrix)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGTransform>::create(imp->createSVGTransformFromMatrix(matrix)).get(), castedThisObj->context()); return result; } -JSValuePtr jsSVGTransformListPrototypeFunctionConsolidate(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionConsolidate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGTransformList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGTransformList::s_info)) return throwError(exec, TypeError); JSSVGTransformList* castedThisObj = static_cast<JSSVGTransformList*>(asObject(thisValue)); SVGTransformList* imp = static_cast<SVGTransformList*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGTransform>::create(imp->consolidate()).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<SVGTransform>::create(imp->consolidate()).get(), castedThisObj->context()); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGTransformList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGTransformList* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGTransformList>(exec, object, context); } -SVGTransformList* toSVGTransformList(JSC::JSValuePtr value) +SVGTransformList* toSVGTransformList(JSC::JSValue value) { - return value->isObject(&JSSVGTransformList::s_info) ? static_cast<JSSVGTransformList*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGTransformList::s_info) ? static_cast<JSSVGTransformList*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTransformList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTransformList.h index 0cdf36957b..bfadcce698 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTransformList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTransformList.h @@ -37,25 +37,25 @@ class JSSVGTransformList : public DOMObject { public: JSSVGTransformList(PassRefPtr<JSC::Structure>, PassRefPtr<SVGTransformList>, SVGElement* context); virtual ~JSSVGTransformList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } // Custom functions - JSC::JSValuePtr clear(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr initialize(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr getItem(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr insertItemBefore(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr replaceItem(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr removeItem(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr appendItem(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue clear(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue initialize(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue getItem(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue insertItemBefore(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue replaceItem(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue removeItem(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue appendItem(JSC::ExecState*, const JSC::ArgList&); SVGTransformList* impl() const { return m_impl.get(); } SVGElement* context() const { return m_context.get(); } @@ -64,16 +64,17 @@ private: RefPtr<SVGTransformList > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGTransformList*, SVGElement* context); -SVGTransformList* toSVGTransformList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGTransformList*, SVGElement* context); +SVGTransformList* toSVGTransformList(JSC::JSValue); class JSSVGTransformListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -82,18 +83,18 @@ public: // Functions -JSC::JSValuePtr jsSVGTransformListPrototypeFunctionClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTransformListPrototypeFunctionInitialize(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTransformListPrototypeFunctionGetItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTransformListPrototypeFunctionInsertItemBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTransformListPrototypeFunctionReplaceItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTransformListPrototypeFunctionRemoveItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTransformListPrototypeFunctionAppendItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTransformListPrototypeFunctionCreateSVGTransformFromMatrix(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGTransformListPrototypeFunctionConsolidate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionInitialize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionGetItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionInsertItemBefore(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionReplaceItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionRemoveItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionAppendItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionCreateSVGTransformFromMatrix(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionConsolidate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGTransformListNumberOfItems(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGTransformListNumberOfItems(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGUnitTypes.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGUnitTypes.cpp index dbfab2dc32..aa0cd4ebc1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGUnitTypes.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGUnitTypes.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGUnitTypes) +ASSERT_CLASS_FITS_IN_CELL(JSSVGUnitTypes); /* Hash table */ @@ -75,13 +75,13 @@ public: JSSVGUnitTypesConstructor(ExecState* exec) : DOMObject(JSSVGUnitTypesConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSSVGUnitTypesPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSSVGUnitTypesPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -113,9 +113,9 @@ static const HashTable JSSVGUnitTypesPrototypeTable = const ClassInfo JSSVGUnitTypesPrototype::s_info = { "SVGUnitTypesPrototype", 0, &JSSVGUnitTypesPrototypeTable, 0 }; -JSObject* JSSVGUnitTypesPrototype::self(ExecState* exec) +JSObject* JSSVGUnitTypesPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGUnitTypes>(exec); + return getDOMPrototype<JSSVGUnitTypes>(exec, globalObject); } bool JSSVGUnitTypesPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -135,12 +135,11 @@ JSSVGUnitTypes::JSSVGUnitTypes(PassRefPtr<Structure> structure, PassRefPtr<SVGUn JSSVGUnitTypes::~JSSVGUnitTypes() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSSVGUnitTypes::createPrototype(ExecState* exec) +JSObject* JSSVGUnitTypes::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGUnitTypesPrototype(JSSVGUnitTypesPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSSVGUnitTypesPrototype(JSSVGUnitTypesPrototype::createStructure(globalObject->objectPrototype())); } bool JSSVGUnitTypes::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -148,39 +147,39 @@ bool JSSVGUnitTypes::getOwnPropertySlot(ExecState* exec, const Identifier& prope return getStaticValueSlot<JSSVGUnitTypes, Base>(exec, &JSSVGUnitTypesTable, this, propertyName, slot); } -JSValuePtr jsSVGUnitTypesConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUnitTypesConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSSVGUnitTypes*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSSVGUnitTypes::getConstructor(ExecState* exec) +JSValue JSSVGUnitTypes::getConstructor(ExecState* exec) { return getDOMConstructor<JSSVGUnitTypesConstructor>(exec); } // Constant getters -JSValuePtr jsSVGUnitTypesSVG_UNIT_TYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGUnitTypesSVG_UNIT_TYPE_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGUnitTypesSVG_UNIT_TYPE_USERSPACEONUSE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGUnitTypesSVG_UNIT_TYPE_USERSPACEONUSE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGUnitTypesSVG_UNIT_TYPE_OBJECTBOUNDINGBOX(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGUnitTypesSVG_UNIT_TYPE_OBJECTBOUNDINGBOX(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, SVGUnitTypes* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, SVGUnitTypes* object, SVGElement* context) { return getDOMObjectWrapper<JSSVGUnitTypes>(exec, object, context); } -SVGUnitTypes* toSVGUnitTypes(JSC::JSValuePtr value) +SVGUnitTypes* toSVGUnitTypes(JSC::JSValue value) { - return value->isObject(&JSSVGUnitTypes::s_info) ? static_cast<JSSVGUnitTypes*>(asObject(value))->impl() : 0; + return value.isObject(&JSSVGUnitTypes::s_info) ? static_cast<JSSVGUnitTypes*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGUnitTypes.h b/src/3rdparty/webkit/WebCore/generated/JSSVGUnitTypes.h index ef22d10ba5..263784b357 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGUnitTypes.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGUnitTypes.h @@ -37,17 +37,17 @@ class JSSVGUnitTypes : public DOMObject { public: JSSVGUnitTypes(PassRefPtr<JSC::Structure>, PassRefPtr<SVGUnitTypes>, SVGElement* context); virtual ~JSSVGUnitTypes(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); SVGUnitTypes* impl() const { return m_impl.get(); } SVGElement* context() const { return m_context.get(); } @@ -56,16 +56,17 @@ private: RefPtr<SVGUnitTypes > m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, SVGUnitTypes*, SVGElement* context); -SVGUnitTypes* toSVGUnitTypes(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, SVGUnitTypes*, SVGElement* context); +SVGUnitTypes* toSVGUnitTypes(JSC::JSValue); class JSSVGUnitTypesPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -74,12 +75,12 @@ public: // Attributes -JSC::JSValuePtr jsSVGUnitTypesConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUnitTypesConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsSVGUnitTypesSVG_UNIT_TYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUnitTypesSVG_UNIT_TYPE_USERSPACEONUSE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUnitTypesSVG_UNIT_TYPE_OBJECTBOUNDINGBOX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUnitTypesSVG_UNIT_TYPE_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUnitTypesSVG_UNIT_TYPE_USERSPACEONUSE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUnitTypesSVG_UNIT_TYPE_OBJECTBOUNDINGBOX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGUseElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGUseElement.cpp index 8ada6d5922..042a7a7de1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGUseElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGUseElement.cpp @@ -55,7 +55,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGUseElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGUseElement); /* Hash table */ @@ -111,9 +111,9 @@ static const HashTable JSSVGUseElementPrototypeTable = const ClassInfo JSSVGUseElementPrototype::s_info = { "SVGUseElementPrototype", 0, &JSSVGUseElementPrototypeTable, 0 }; -JSObject* JSSVGUseElementPrototype::self(ExecState* exec) +JSObject* JSSVGUseElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGUseElement>(exec); + return getDOMPrototype<JSSVGUseElement>(exec, globalObject); } bool JSSVGUseElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,9 +128,9 @@ JSSVGUseElement::JSSVGUseElement(PassRefPtr<Structure> structure, PassRefPtr<SVG { } -JSObject* JSSVGUseElement::createPrototype(ExecState* exec) +JSObject* JSSVGUseElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGUseElementPrototype(JSSVGUseElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGUseElementPrototype(JSSVGUseElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGUseElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -138,212 +138,236 @@ bool JSSVGUseElement::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSSVGUseElement, Base>(exec, &JSSVGUseElementTable, this, propertyName, slot); } -JSValuePtr jsSVGUseElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->xAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGUseElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->yAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGUseElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->widthAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGUseElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedLength> obj = imp->heightAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGUseElementInstanceRoot(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementInstanceRoot(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->instanceRoot())); } -JSValuePtr jsSVGUseElementAnimatedInstanceRoot(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementAnimatedInstanceRoot(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->animatedInstanceRoot())); } -JSValuePtr jsSVGUseElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->hrefAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGUseElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); } -JSValuePtr jsSVGUseElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); } -JSValuePtr jsSVGUseElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); } -JSValuePtr jsSVGUseElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmllang()); } -JSValuePtr jsSVGUseElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->xmlspace()); } -JSValuePtr jsSVGUseElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGUseElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedString> obj = imp->classNameAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGUseElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsSVGUseElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedTransformList> obj = imp->transformAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGUseElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); } -JSValuePtr jsSVGUseElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGUseElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); } -void JSSVGUseElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGUseElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGUseElement, Base>(exec, propertyName, value, &JSSVGUseElementTable, this, slot); } -void setJSSVGUseElementXmllang(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGUseElementXmllang(ExecState* exec, JSObject* thisObject, JSValue value) { SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(thisObject)->impl()); - imp->setXmllang(value->toString(exec)); + imp->setXmllang(value.toString(exec)); } -void setJSSVGUseElementXmlspace(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGUseElementXmlspace(ExecState* exec, JSObject* thisObject, JSValue value) { SVGUseElement* imp = static_cast<SVGUseElement*>(static_cast<JSSVGUseElement*>(thisObject)->impl()); - imp->setXmlspace(value->toString(exec)); + imp->setXmlspace(value.toString(exec)); } -JSValuePtr jsSVGUseElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGUseElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGUseElement::s_info)) return throwError(exec, TypeError); JSSVGUseElement* castedThisObj = static_cast<JSSVGUseElement*>(asObject(thisValue)); SVGUseElement* imp = static_cast<SVGUseElement*>(castedThisObj->impl()); - const UString& extension = args.at(exec, 0)->toString(exec); + const UString& extension = args.at(0).toString(exec); - JSC::JSValuePtr result = jsBoolean(imp->hasExtension(extension)); + JSC::JSValue result = jsBoolean(imp->hasExtension(extension)); return result; } -JSValuePtr jsSVGUseElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGUseElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGUseElement::s_info)) return throwError(exec, TypeError); JSSVGUseElement* castedThisObj = static_cast<JSSVGUseElement*>(asObject(thisValue)); SVGUseElement* imp = static_cast<SVGUseElement*>(castedThisObj->impl()); - const UString& name = args.at(exec, 0)->toString(exec); + const UString& name = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); return result; } -JSValuePtr jsSVGUseElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGUseElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGUseElement::s_info)) return throwError(exec, TypeError); JSSVGUseElement* castedThisObj = static_cast<JSSVGUseElement*>(asObject(thisValue)); SVGUseElement* imp = static_cast<SVGUseElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->getBBox()).get(), imp); return result; } -JSValuePtr jsSVGUseElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionGetCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGUseElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGUseElement::s_info)) return throwError(exec, TypeError); JSSVGUseElement* castedThisObj = static_cast<JSSVGUseElement*>(asObject(thisValue)); SVGUseElement* imp = static_cast<SVGUseElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getCTM()).get(), imp); return result; } -JSValuePtr jsSVGUseElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionGetScreenCTM(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGUseElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGUseElement::s_info)) return throwError(exec, TypeError); JSSVGUseElement* castedThisObj = static_cast<JSSVGUseElement*>(asObject(thisValue)); SVGUseElement* imp = static_cast<SVGUseElement*>(castedThisObj->impl()); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getScreenCTM()).get(), imp); return result; } -JSValuePtr jsSVGUseElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionGetTransformToElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSSVGUseElement::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSSVGUseElement::s_info)) return throwError(exec, TypeError); JSSVGUseElement* castedThisObj = static_cast<JSSVGUseElement*>(asObject(thisValue)); SVGUseElement* imp = static_cast<SVGUseElement*>(castedThisObj->impl()); ExceptionCode ec = 0; - SVGElement* element = toSVGElement(args.at(exec, 0)); + SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValuePtr result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGUseElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGUseElement.h index 1b5e357cf2..6957771123 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGUseElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGUseElement.h @@ -34,13 +34,13 @@ class JSSVGUseElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGUseElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGUseElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGUseElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,34 +64,34 @@ public: // Functions -JSC::JSValuePtr jsSVGUseElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGUseElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGUseElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGUseElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGUseElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsSVGUseElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionHasExtension(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionGetPresentationAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionGetBBox(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionGetCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionGetScreenCTM(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionGetTransformToElement(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsSVGUseElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUseElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUseElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUseElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUseElementInstanceRoot(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUseElementAnimatedInstanceRoot(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUseElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUseElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUseElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUseElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUseElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGUseElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGUseElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGUseElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsSVGUseElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUseElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUseElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUseElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUseElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGUseElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUseElementX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUseElementY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUseElementWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUseElementHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUseElementInstanceRoot(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUseElementAnimatedInstanceRoot(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUseElementHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUseElementRequiredFeatures(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUseElementRequiredExtensions(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUseElementSystemLanguage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUseElementXmllang(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGUseElementXmllang(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGUseElementXmlspace(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGUseElementXmlspace(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsSVGUseElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUseElementClassName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUseElementStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUseElementTransform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUseElementNearestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGUseElementFarthestViewportElement(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGViewElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGViewElement.cpp index d8291ba8e0..930dc7ba21 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGViewElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGViewElement.cpp @@ -41,7 +41,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGViewElement) +ASSERT_CLASS_FITS_IN_CELL(JSSVGViewElement); /* Hash table */ @@ -81,9 +81,9 @@ static const HashTable JSSVGViewElementPrototypeTable = const ClassInfo JSSVGViewElementPrototype::s_info = { "SVGViewElementPrototype", 0, &JSSVGViewElementPrototypeTable, 0 }; -JSObject* JSSVGViewElementPrototype::self(ExecState* exec) +JSObject* JSSVGViewElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGViewElement>(exec); + return getDOMPrototype<JSSVGViewElement>(exec, globalObject); } bool JSSVGViewElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -98,9 +98,9 @@ JSSVGViewElement::JSSVGViewElement(PassRefPtr<Structure> structure, PassRefPtr<S { } -JSObject* JSSVGViewElement::createPrototype(ExecState* exec) +JSObject* JSSVGViewElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGViewElementPrototype(JSSVGViewElementPrototype::createStructure(JSSVGElementPrototype::self(exec))); + return new (exec) JSSVGViewElementPrototype(JSSVGViewElementPrototype::createStructure(JSSVGElementPrototype::self(exec, globalObject))); } bool JSSVGViewElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -108,63 +108,68 @@ bool JSSVGViewElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSSVGViewElement, Base>(exec, &JSSVGViewElementTable, this, propertyName, slot); } -JSValuePtr jsSVGViewElementViewTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGViewElementViewTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGViewElement* imp = static_cast<SVGViewElement*>(static_cast<JSSVGViewElement*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->viewTarget()), imp); } -JSValuePtr jsSVGViewElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGViewElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGViewElement* imp = static_cast<SVGViewElement*>(static_cast<JSSVGViewElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedBoolean> obj = imp->externalResourcesRequiredAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGViewElementViewBox(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGViewElementViewBox(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGViewElement* imp = static_cast<SVGViewElement*>(static_cast<JSSVGViewElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedRect> obj = imp->viewBoxAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGViewElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGViewElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGViewElement* imp = static_cast<SVGViewElement*>(static_cast<JSSVGViewElement*>(asObject(slot.slotBase()))->impl()); RefPtr<SVGAnimatedPreserveAspectRatio> obj = imp->preserveAspectRatioAnimated(); return toJS(exec, obj.get(), imp); } -JSValuePtr jsSVGViewElementZoomAndPan(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGViewElementZoomAndPan(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGViewElement* imp = static_cast<SVGViewElement*>(static_cast<JSSVGViewElement*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->zoomAndPan()); } -void JSSVGViewElement::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSSVGViewElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSSVGViewElement, Base>(exec, propertyName, value, &JSSVGViewElementTable, this, slot); } -void setJSSVGViewElementZoomAndPan(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSSVGViewElementZoomAndPan(ExecState* exec, JSObject* thisObject, JSValue value) { SVGViewElement* imp = static_cast<SVGViewElement*>(static_cast<JSSVGViewElement*>(thisObject)->impl()); - imp->setZoomAndPan(value->toInt32(exec)); + imp->setZoomAndPan(value.toInt32(exec)); } // Constant getters -JSValuePtr jsSVGViewElementSVG_ZOOMANDPAN_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGViewElementSVG_ZOOMANDPAN_UNKNOWN(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsSVGViewElementSVG_ZOOMANDPAN_DISABLE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGViewElementSVG_ZOOMANDPAN_DISABLE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsSVGViewElementSVG_ZOOMANDPAN_MAGNIFY(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsSVGViewElementSVG_ZOOMANDPAN_MAGNIFY(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGViewElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGViewElement.h index 0575720bd3..13ba9a8b73 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGViewElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGViewElement.h @@ -34,13 +34,13 @@ class JSSVGViewElement : public JSSVGElement { typedef JSSVGElement Base; public: JSSVGViewElement(PassRefPtr<JSC::Structure>, PassRefPtr<SVGViewElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,12 +49,13 @@ public: class JSSVGViewElementPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -63,17 +64,17 @@ public: // Attributes -JSC::JSValuePtr jsSVGViewElementViewTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGViewElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGViewElementViewBox(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGViewElementPreserveAspectRatio(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGViewElementZoomAndPan(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSSVGViewElementZoomAndPan(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsSVGViewElementViewTarget(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGViewElementExternalResourcesRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGViewElementViewBox(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGViewElementPreserveAspectRatio(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGViewElementZoomAndPan(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSSVGViewElementZoomAndPan(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); // Constants -JSC::JSValuePtr jsSVGViewElementSVG_ZOOMANDPAN_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGViewElementSVG_ZOOMANDPAN_DISABLE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGViewElementSVG_ZOOMANDPAN_MAGNIFY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGViewElementSVG_ZOOMANDPAN_UNKNOWN(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGViewElementSVG_ZOOMANDPAN_DISABLE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGViewElementSVG_ZOOMANDPAN_MAGNIFY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGZoomEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGZoomEvent.cpp index 860b3d7174..3c74fe9b27 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGZoomEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGZoomEvent.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSSVGZoomEvent) +ASSERT_CLASS_FITS_IN_CELL(JSSVGZoomEvent); /* Hash table */ @@ -75,21 +75,21 @@ static const HashTable JSSVGZoomEventPrototypeTable = const ClassInfo JSSVGZoomEventPrototype::s_info = { "SVGZoomEventPrototype", 0, &JSSVGZoomEventPrototypeTable, 0 }; -JSObject* JSSVGZoomEventPrototype::self(ExecState* exec) +JSObject* JSSVGZoomEventPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSSVGZoomEvent>(exec); + return getDOMPrototype<JSSVGZoomEvent>(exec, globalObject); } const ClassInfo JSSVGZoomEvent::s_info = { "SVGZoomEvent", &JSUIEvent::s_info, &JSSVGZoomEventTable, 0 }; -JSSVGZoomEvent::JSSVGZoomEvent(PassRefPtr<Structure> structure, PassRefPtr<SVGZoomEvent> impl, SVGElement* context) +JSSVGZoomEvent::JSSVGZoomEvent(PassRefPtr<Structure> structure, PassRefPtr<SVGZoomEvent> impl, SVGElement*) : JSUIEvent(structure, impl) { } -JSObject* JSSVGZoomEvent::createPrototype(ExecState* exec) +JSObject* JSSVGZoomEvent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSSVGZoomEventPrototype(JSSVGZoomEventPrototype::createStructure(JSUIEventPrototype::self(exec))); + return new (exec) JSSVGZoomEventPrototype(JSSVGZoomEventPrototype::createStructure(JSUIEventPrototype::self(exec, globalObject))); } bool JSSVGZoomEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -97,32 +97,37 @@ bool JSSVGZoomEvent::getOwnPropertySlot(ExecState* exec, const Identifier& prope return getStaticValueSlot<JSSVGZoomEvent, Base>(exec, &JSSVGZoomEventTable, this, propertyName, slot); } -JSValuePtr jsSVGZoomEventZoomRectScreen(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGZoomEventZoomRectScreen(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGZoomEvent* imp = static_cast<SVGZoomEvent*>(static_cast<JSSVGZoomEvent*>(asObject(slot.slotBase()))->impl()); return toJS(exec, JSSVGStaticPODTypeWrapper<FloatRect>::create(imp->zoomRectScreen()).get(), 0); } -JSValuePtr jsSVGZoomEventPreviousScale(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGZoomEventPreviousScale(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGZoomEvent* imp = static_cast<SVGZoomEvent*>(static_cast<JSSVGZoomEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->previousScale()); } -JSValuePtr jsSVGZoomEventPreviousTranslate(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGZoomEventPreviousTranslate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGZoomEvent* imp = static_cast<SVGZoomEvent*>(static_cast<JSSVGZoomEvent*>(asObject(slot.slotBase()))->impl()); return toJS(exec, JSSVGStaticPODTypeWrapper<FloatPoint>::create(imp->previousTranslate()).get(), 0); } -JSValuePtr jsSVGZoomEventNewScale(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGZoomEventNewScale(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGZoomEvent* imp = static_cast<SVGZoomEvent*>(static_cast<JSSVGZoomEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->newScale()); } -JSValuePtr jsSVGZoomEventNewTranslate(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsSVGZoomEventNewTranslate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); SVGZoomEvent* imp = static_cast<SVGZoomEvent*>(static_cast<JSSVGZoomEvent*>(asObject(slot.slotBase()))->impl()); return toJS(exec, JSSVGStaticPODTypeWrapper<FloatPoint>::create(imp->newTranslate()).get(), 0); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGZoomEvent.h b/src/3rdparty/webkit/WebCore/generated/JSSVGZoomEvent.h index 941281928b..f053122292 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGZoomEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGZoomEvent.h @@ -34,12 +34,12 @@ class JSSVGZoomEvent : public JSUIEvent { typedef JSUIEvent Base; public: JSSVGZoomEvent(PassRefPtr<JSC::Structure>, PassRefPtr<SVGZoomEvent>, SVGElement* context); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -48,8 +48,9 @@ public: class JSSVGZoomEventPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSSVGZoomEventPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -57,11 +58,11 @@ public: // Attributes -JSC::JSValuePtr jsSVGZoomEventZoomRectScreen(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGZoomEventPreviousScale(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGZoomEventPreviousTranslate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGZoomEventNewScale(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsSVGZoomEventNewTranslate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGZoomEventZoomRectScreen(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGZoomEventPreviousScale(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGZoomEventPreviousTranslate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGZoomEventNewScale(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsSVGZoomEventNewTranslate(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSScreen.cpp b/src/3rdparty/webkit/WebCore/generated/JSScreen.cpp index 67f6aaee62..00119a484d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSScreen.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSScreen.cpp @@ -32,7 +32,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSScreen) +ASSERT_CLASS_FITS_IN_CELL(JSScreen); /* Hash table */ @@ -72,9 +72,9 @@ static const HashTable JSScreenPrototypeTable = const ClassInfo JSScreenPrototype::s_info = { "ScreenPrototype", 0, &JSScreenPrototypeTable, 0 }; -JSObject* JSScreenPrototype::self(ExecState* exec) +JSObject* JSScreenPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSScreen>(exec); + return getDOMPrototype<JSScreen>(exec, globalObject); } const ClassInfo JSScreen::s_info = { "Screen", 0, &JSScreenTable, 0 }; @@ -88,12 +88,11 @@ JSScreen::JSScreen(PassRefPtr<Structure> structure, PassRefPtr<Screen> impl) JSScreen::~JSScreen() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSScreen::createPrototype(ExecState* exec) +JSObject* JSScreen::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSScreenPrototype(JSScreenPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSScreenPrototype(JSScreenPrototype::createStructure(globalObject->objectPrototype())); } bool JSScreen::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -101,61 +100,69 @@ bool JSScreen::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNam return getStaticValueSlot<JSScreen, Base>(exec, &JSScreenTable, this, propertyName, slot); } -JSValuePtr jsScreenHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsScreenHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Screen* imp = static_cast<Screen*>(static_cast<JSScreen*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->height()); } -JSValuePtr jsScreenWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsScreenWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Screen* imp = static_cast<Screen*>(static_cast<JSScreen*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->width()); } -JSValuePtr jsScreenColorDepth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsScreenColorDepth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Screen* imp = static_cast<Screen*>(static_cast<JSScreen*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->colorDepth()); } -JSValuePtr jsScreenPixelDepth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsScreenPixelDepth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Screen* imp = static_cast<Screen*>(static_cast<JSScreen*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->pixelDepth()); } -JSValuePtr jsScreenAvailLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsScreenAvailLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Screen* imp = static_cast<Screen*>(static_cast<JSScreen*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->availLeft()); } -JSValuePtr jsScreenAvailTop(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsScreenAvailTop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Screen* imp = static_cast<Screen*>(static_cast<JSScreen*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->availTop()); } -JSValuePtr jsScreenAvailHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsScreenAvailHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Screen* imp = static_cast<Screen*>(static_cast<JSScreen*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->availHeight()); } -JSValuePtr jsScreenAvailWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsScreenAvailWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Screen* imp = static_cast<Screen*>(static_cast<JSScreen*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->availWidth()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, Screen* object) +JSC::JSValue toJS(JSC::ExecState* exec, Screen* object) { return getDOMObjectWrapper<JSScreen>(exec, object); } -Screen* toScreen(JSC::JSValuePtr value) +Screen* toScreen(JSC::JSValue value) { - return value->isObject(&JSScreen::s_info) ? static_cast<JSScreen*>(asObject(value))->impl() : 0; + return value.isObject(&JSScreen::s_info) ? static_cast<JSScreen*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSScreen.h b/src/3rdparty/webkit/WebCore/generated/JSScreen.h index 60d0183578..4e7be7b777 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSScreen.h +++ b/src/3rdparty/webkit/WebCore/generated/JSScreen.h @@ -34,12 +34,12 @@ class JSScreen : public DOMObject { public: JSScreen(PassRefPtr<JSC::Structure>, PassRefPtr<Screen>); virtual ~JSScreen(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -50,12 +50,13 @@ private: RefPtr<Screen> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, Screen*); -Screen* toScreen(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, Screen*); +Screen* toScreen(JSC::JSValue); class JSScreenPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSScreenPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -63,14 +64,14 @@ public: // Attributes -JSC::JSValuePtr jsScreenHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsScreenWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsScreenColorDepth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsScreenPixelDepth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsScreenAvailLeft(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsScreenAvailTop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsScreenAvailHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsScreenAvailWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsScreenHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsScreenWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsScreenColorDepth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsScreenPixelDepth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsScreenAvailLeft(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsScreenAvailTop(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsScreenAvailHeight(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsScreenAvailWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSStorage.cpp b/src/3rdparty/webkit/WebCore/generated/JSStorage.cpp index ea245530e7..de43ae4cc2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSStorage.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSStorage.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSStorage) +ASSERT_CLASS_FITS_IN_CELL(JSStorage); /* Hash table */ @@ -74,13 +74,13 @@ public: JSStorageConstructor(ExecState* exec) : DOMObject(JSStorageConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSStoragePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSStoragePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -114,9 +114,9 @@ static const HashTable JSStoragePrototypeTable = const ClassInfo JSStoragePrototype::s_info = { "StoragePrototype", 0, &JSStoragePrototypeTable, 0 }; -JSObject* JSStoragePrototype::self(ExecState* exec) +JSObject* JSStoragePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSStorage>(exec); + return getDOMPrototype<JSStorage>(exec, globalObject); } bool JSStoragePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -135,12 +135,11 @@ JSStorage::JSStorage(PassRefPtr<Structure> structure, PassRefPtr<Storage> impl) JSStorage::~JSStorage() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSStorage::createPrototype(ExecState* exec) +JSObject* JSStorage::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSStoragePrototype(JSStoragePrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSStoragePrototype(JSStoragePrototype::createStructure(globalObject->objectPrototype())); } bool JSStorage::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -157,17 +156,18 @@ bool JSStorage::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa return getStaticValueSlot<JSStorage, Base>(exec, &JSStorageTable, this, propertyName, slot); } -JSValuePtr jsStorageLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStorageLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Storage* imp = static_cast<Storage*>(static_cast<JSStorage*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsStorageConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStorageConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSStorage*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSStorage::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSStorage::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { if (customPut(exec, propertyName, value, slot)) return; @@ -181,69 +181,74 @@ void JSStorage::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNam Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSStorage::getConstructor(ExecState* exec) +JSValue JSStorage::getConstructor(ExecState* exec) { return getDOMConstructor<JSStorageConstructor>(exec); } -JSValuePtr jsStoragePrototypeFunctionKey(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsStoragePrototypeFunctionKey(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSStorage::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSStorage::s_info)) return throwError(exec, TypeError); JSStorage* castedThisObj = static_cast<JSStorage*>(asObject(thisValue)); Storage* imp = static_cast<Storage*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = jsString(exec, imp->key(index, ec)); + JSC::JSValue result = jsString(exec, imp->key(index, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsStoragePrototypeFunctionGetItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsStoragePrototypeFunctionGetItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSStorage::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSStorage::s_info)) return throwError(exec, TypeError); JSStorage* castedThisObj = static_cast<JSStorage*>(asObject(thisValue)); Storage* imp = static_cast<Storage*>(castedThisObj->impl()); - const UString& key = args.at(exec, 0)->toString(exec); + const UString& key = args.at(0).toString(exec); - JSC::JSValuePtr result = jsStringOrNull(exec, imp->getItem(key)); + JSC::JSValue result = jsStringOrNull(exec, imp->getItem(key)); return result; } -JSValuePtr jsStoragePrototypeFunctionSetItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsStoragePrototypeFunctionSetItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSStorage::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSStorage::s_info)) return throwError(exec, TypeError); JSStorage* castedThisObj = static_cast<JSStorage*>(asObject(thisValue)); Storage* imp = static_cast<Storage*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& key = args.at(exec, 0)->toString(exec); - const UString& data = args.at(exec, 1)->toString(exec); + const UString& key = args.at(0).toString(exec); + const UString& data = args.at(1).toString(exec); imp->setItem(key, data, ec); setDOMException(exec, ec); return jsUndefined(); } -JSValuePtr jsStoragePrototypeFunctionRemoveItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsStoragePrototypeFunctionRemoveItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSStorage::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSStorage::s_info)) return throwError(exec, TypeError); JSStorage* castedThisObj = static_cast<JSStorage*>(asObject(thisValue)); Storage* imp = static_cast<Storage*>(castedThisObj->impl()); - const UString& key = args.at(exec, 0)->toString(exec); + const UString& key = args.at(0).toString(exec); imp->removeItem(key); return jsUndefined(); } -JSValuePtr jsStoragePrototypeFunctionClear(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsStoragePrototypeFunctionClear(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSStorage::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSStorage::s_info)) return throwError(exec, TypeError); JSStorage* castedThisObj = static_cast<JSStorage*>(asObject(thisValue)); Storage* imp = static_cast<Storage*>(castedThisObj->impl()); @@ -252,13 +257,13 @@ JSValuePtr jsStoragePrototypeFunctionClear(ExecState* exec, JSObject*, JSValuePt return jsUndefined(); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, Storage* object) +JSC::JSValue toJS(JSC::ExecState* exec, Storage* object) { return getDOMObjectWrapper<JSStorage>(exec, object); } -Storage* toStorage(JSC::JSValuePtr value) +Storage* toStorage(JSC::JSValue value) { - return value->isObject(&JSStorage::s_info) ? static_cast<JSStorage*>(asObject(value))->impl() : 0; + return value.isObject(&JSStorage::s_info) ? static_cast<JSStorage*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSStorage.h b/src/3rdparty/webkit/WebCore/generated/JSStorage.h index 4a3579ad66..64a06a2744 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSStorage.h +++ b/src/3rdparty/webkit/WebCore/generated/JSStorage.h @@ -34,14 +34,14 @@ class JSStorage : public DOMObject { public: JSStorage(PassRefPtr<JSC::Structure>, PassRefPtr<Storage>); virtual ~JSStorage(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); - bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); + bool customPut(JSC::ExecState*, const JSC::Identifier&, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,26 +49,27 @@ public: virtual bool deleteProperty(JSC::ExecState*, const JSC::Identifier&); virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); bool customGetPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); Storage* impl() const { return m_impl.get(); } private: RefPtr<Storage> m_impl; private: static bool canGetItemsForName(JSC::ExecState*, Storage*, const JSC::Identifier&); - static JSC::JSValuePtr nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValuePtr toJS(JSC::ExecState*, Storage*); -Storage* toStorage(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, Storage*); +Storage* toStorage(JSC::JSValue); class JSStoragePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -77,15 +78,15 @@ public: // Functions -JSC::JSValuePtr jsStoragePrototypeFunctionKey(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsStoragePrototypeFunctionGetItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsStoragePrototypeFunctionSetItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsStoragePrototypeFunctionRemoveItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsStoragePrototypeFunctionClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsStoragePrototypeFunctionKey(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsStoragePrototypeFunctionGetItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsStoragePrototypeFunctionSetItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsStoragePrototypeFunctionRemoveItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsStoragePrototypeFunctionClear(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsStorageLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsStorageConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStorageLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStorageConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSStorageEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSStorageEvent.cpp index eda205c426..4929839ebe 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSStorageEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSStorageEvent.cpp @@ -26,7 +26,9 @@ #include "DOMWindow.h" #include "JSDOMWindow.h" +#include "JSStorage.h" #include "KURL.h" +#include "Storage.h" #include "StorageEvent.h" #include <runtime/Error.h> @@ -37,17 +39,18 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSStorageEvent) +ASSERT_CLASS_FITS_IN_CELL(JSStorageEvent); /* Hash table */ -static const HashTableValue JSStorageEventTableValues[7] = +static const HashTableValue JSStorageEventTableValues[8] = { { "key", DontDelete|ReadOnly, (intptr_t)jsStorageEventKey, (intptr_t)0 }, { "oldValue", DontDelete|ReadOnly, (intptr_t)jsStorageEventOldValue, (intptr_t)0 }, { "newValue", DontDelete|ReadOnly, (intptr_t)jsStorageEventNewValue, (intptr_t)0 }, { "uri", DontDelete|ReadOnly, (intptr_t)jsStorageEventUri, (intptr_t)0 }, { "source", DontDelete|ReadOnly, (intptr_t)jsStorageEventSource, (intptr_t)0 }, + { "storageArea", DontDelete|ReadOnly, (intptr_t)jsStorageEventStorageArea, (intptr_t)0 }, { "constructor", DontEnum|ReadOnly, (intptr_t)jsStorageEventConstructor, (intptr_t)0 }, { 0, 0, 0, 0 } }; @@ -78,13 +81,13 @@ public: JSStorageEventConstructor(ExecState* exec) : DOMObject(JSStorageEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSStorageEventPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSStorageEventPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -101,7 +104,7 @@ bool JSStorageEventConstructor::getOwnPropertySlot(ExecState* exec, const Identi static const HashTableValue JSStorageEventPrototypeTableValues[2] = { - { "initStorageEvent", DontDelete|Function, (intptr_t)jsStorageEventPrototypeFunctionInitStorageEvent, (intptr_t)8 }, + { "initStorageEvent", DontDelete|Function, (intptr_t)jsStorageEventPrototypeFunctionInitStorageEvent, (intptr_t)9 }, { 0, 0, 0, 0 } }; @@ -114,9 +117,9 @@ static const HashTable JSStorageEventPrototypeTable = const ClassInfo JSStorageEventPrototype::s_info = { "StorageEventPrototype", 0, &JSStorageEventPrototypeTable, 0 }; -JSObject* JSStorageEventPrototype::self(ExecState* exec) +JSObject* JSStorageEventPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSStorageEvent>(exec); + return getDOMPrototype<JSStorageEvent>(exec, globalObject); } bool JSStorageEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -131,9 +134,9 @@ JSStorageEvent::JSStorageEvent(PassRefPtr<Structure> structure, PassRefPtr<Stora { } -JSObject* JSStorageEvent::createPrototype(ExecState* exec) +JSObject* JSStorageEvent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSStorageEventPrototype(JSStorageEventPrototype::createStructure(JSEventPrototype::self(exec))); + return new (exec) JSStorageEventPrototype(JSStorageEventPrototype::createStructure(JSEventPrototype::self(exec, globalObject))); } bool JSStorageEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -141,61 +144,75 @@ bool JSStorageEvent::getOwnPropertySlot(ExecState* exec, const Identifier& prope return getStaticValueSlot<JSStorageEvent, Base>(exec, &JSStorageEventTable, this, propertyName, slot); } -JSValuePtr jsStorageEventKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStorageEventKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); StorageEvent* imp = static_cast<StorageEvent*>(static_cast<JSStorageEvent*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->key()); } -JSValuePtr jsStorageEventOldValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStorageEventOldValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); StorageEvent* imp = static_cast<StorageEvent*>(static_cast<JSStorageEvent*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->oldValue()); } -JSValuePtr jsStorageEventNewValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStorageEventNewValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); StorageEvent* imp = static_cast<StorageEvent*>(static_cast<JSStorageEvent*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->newValue()); } -JSValuePtr jsStorageEventUri(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStorageEventUri(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); StorageEvent* imp = static_cast<StorageEvent*>(static_cast<JSStorageEvent*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->uri()); } -JSValuePtr jsStorageEventSource(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStorageEventSource(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); StorageEvent* imp = static_cast<StorageEvent*>(static_cast<JSStorageEvent*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->source())); } -JSValuePtr jsStorageEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStorageEventStorageArea(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + StorageEvent* imp = static_cast<StorageEvent*>(static_cast<JSStorageEvent*>(asObject(slot.slotBase()))->impl()); + return toJS(exec, WTF::getPtr(imp->storageArea())); +} + +JSValue jsStorageEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSStorageEvent*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSStorageEvent::getConstructor(ExecState* exec) +JSValue JSStorageEvent::getConstructor(ExecState* exec) { return getDOMConstructor<JSStorageEventConstructor>(exec); } -JSValuePtr jsStorageEventPrototypeFunctionInitStorageEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsStorageEventPrototypeFunctionInitStorageEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSStorageEvent::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSStorageEvent::s_info)) return throwError(exec, TypeError); JSStorageEvent* castedThisObj = static_cast<JSStorageEvent*>(asObject(thisValue)); StorageEvent* imp = static_cast<StorageEvent*>(castedThisObj->impl()); - const UString& typeArg = args.at(exec, 0)->toString(exec); - bool canBubbleArg = args.at(exec, 1)->toBoolean(exec); - bool cancelableArg = args.at(exec, 2)->toBoolean(exec); - const UString& keyArg = args.at(exec, 3)->toString(exec); - const UString& oldValueArg = valueToStringWithNullCheck(exec, args.at(exec, 4)); - const UString& newValueArg = valueToStringWithNullCheck(exec, args.at(exec, 5)); - const UString& uriArg = args.at(exec, 6)->toString(exec); - DOMWindow* sourceArg = toDOMWindow(args.at(exec, 7)); - - imp->initStorageEvent(typeArg, canBubbleArg, cancelableArg, keyArg, oldValueArg, newValueArg, uriArg, sourceArg); + const UString& typeArg = args.at(0).toString(exec); + bool canBubbleArg = args.at(1).toBoolean(exec); + bool cancelableArg = args.at(2).toBoolean(exec); + const UString& keyArg = args.at(3).toString(exec); + const UString& oldValueArg = valueToStringWithNullCheck(exec, args.at(4)); + const UString& newValueArg = valueToStringWithNullCheck(exec, args.at(5)); + const UString& uriArg = args.at(6).toString(exec); + DOMWindow* sourceArg = toDOMWindow(args.at(7)); + Storage* storageAreaArg = toStorage(args.at(8)); + + imp->initStorageEvent(typeArg, canBubbleArg, cancelableArg, keyArg, oldValueArg, newValueArg, uriArg, sourceArg, storageAreaArg); return jsUndefined(); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSStorageEvent.h b/src/3rdparty/webkit/WebCore/generated/JSStorageEvent.h index 7489484308..967ab3118f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSStorageEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSStorageEvent.h @@ -31,27 +31,28 @@ class JSStorageEvent : public JSEvent { typedef JSEvent Base; public: JSStorageEvent(PassRefPtr<JSC::Structure>, PassRefPtr<StorageEvent>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSStorageEventPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,15 +61,16 @@ public: // Functions -JSC::JSValuePtr jsStorageEventPrototypeFunctionInitStorageEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsStorageEventPrototypeFunctionInitStorageEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsStorageEventKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsStorageEventOldValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsStorageEventNewValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsStorageEventUri(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsStorageEventSource(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsStorageEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStorageEventKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStorageEventOldValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStorageEventNewValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStorageEventUri(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStorageEventSource(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStorageEventStorageArea(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStorageEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSStyleSheet.cpp b/src/3rdparty/webkit/WebCore/generated/JSStyleSheet.cpp index 193eddaa78..bec95c08ef 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSStyleSheet.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSStyleSheet.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSStyleSheet) +ASSERT_CLASS_FITS_IN_CELL(JSStyleSheet); /* Hash table */ @@ -81,13 +81,13 @@ public: JSStyleSheetConstructor(ExecState* exec) : DOMObject(JSStyleSheetConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSStyleSheetPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSStyleSheetPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -116,9 +116,9 @@ static const HashTable JSStyleSheetPrototypeTable = const ClassInfo JSStyleSheetPrototype::s_info = { "StyleSheetPrototype", 0, &JSStyleSheetPrototypeTable, 0 }; -JSObject* JSStyleSheetPrototype::self(ExecState* exec) +JSObject* JSStyleSheetPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSStyleSheet>(exec); + return getDOMPrototype<JSStyleSheet>(exec, globalObject); } const ClassInfo JSStyleSheet::s_info = { "StyleSheet", 0, &JSStyleSheetTable, 0 }; @@ -132,12 +132,11 @@ JSStyleSheet::JSStyleSheet(PassRefPtr<Structure> structure, PassRefPtr<StyleShee JSStyleSheet::~JSStyleSheet() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSStyleSheet::createPrototype(ExecState* exec) +JSObject* JSStyleSheet::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSStyleSheetPrototype(JSStyleSheetPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSStyleSheetPrototype(JSStyleSheetPrototype::createStructure(globalObject->objectPrototype())); } bool JSStyleSheet::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -145,71 +144,78 @@ bool JSStyleSheet::getOwnPropertySlot(ExecState* exec, const Identifier& propert return getStaticValueSlot<JSStyleSheet, Base>(exec, &JSStyleSheetTable, this, propertyName, slot); } -JSValuePtr jsStyleSheetType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStyleSheetType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); StyleSheet* imp = static_cast<StyleSheet*>(static_cast<JSStyleSheet*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->type()); } -JSValuePtr jsStyleSheetDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStyleSheetDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); StyleSheet* imp = static_cast<StyleSheet*>(static_cast<JSStyleSheet*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->disabled()); } -JSValuePtr jsStyleSheetOwnerNode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStyleSheetOwnerNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); StyleSheet* imp = static_cast<StyleSheet*>(static_cast<JSStyleSheet*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->ownerNode())); } -JSValuePtr jsStyleSheetParentStyleSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStyleSheetParentStyleSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); StyleSheet* imp = static_cast<StyleSheet*>(static_cast<JSStyleSheet*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->parentStyleSheet())); } -JSValuePtr jsStyleSheetHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStyleSheetHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); StyleSheet* imp = static_cast<StyleSheet*>(static_cast<JSStyleSheet*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->href()); } -JSValuePtr jsStyleSheetTitle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStyleSheetTitle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); StyleSheet* imp = static_cast<StyleSheet*>(static_cast<JSStyleSheet*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->title()); } -JSValuePtr jsStyleSheetMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStyleSheetMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); StyleSheet* imp = static_cast<StyleSheet*>(static_cast<JSStyleSheet*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->media())); } -JSValuePtr jsStyleSheetConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStyleSheetConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSStyleSheet*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSStyleSheet::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSStyleSheet::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSStyleSheet, Base>(exec, propertyName, value, &JSStyleSheetTable, this, slot); } -void setJSStyleSheetDisabled(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSStyleSheetDisabled(ExecState* exec, JSObject* thisObject, JSValue value) { StyleSheet* imp = static_cast<StyleSheet*>(static_cast<JSStyleSheet*>(thisObject)->impl()); - imp->setDisabled(value->toBoolean(exec)); + imp->setDisabled(value.toBoolean(exec)); } -JSValuePtr JSStyleSheet::getConstructor(ExecState* exec) +JSValue JSStyleSheet::getConstructor(ExecState* exec) { return getDOMConstructor<JSStyleSheetConstructor>(exec); } -StyleSheet* toStyleSheet(JSC::JSValuePtr value) +StyleSheet* toStyleSheet(JSC::JSValue value) { - return value->isObject(&JSStyleSheet::s_info) ? static_cast<JSStyleSheet*>(asObject(value))->impl() : 0; + return value.isObject(&JSStyleSheet::s_info) ? static_cast<JSStyleSheet*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSStyleSheet.h b/src/3rdparty/webkit/WebCore/generated/JSStyleSheet.h index c477eeb919..d8e751e838 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSStyleSheet.h +++ b/src/3rdparty/webkit/WebCore/generated/JSStyleSheet.h @@ -34,32 +34,33 @@ class JSStyleSheet : public DOMObject { public: JSStyleSheet(PassRefPtr<JSC::Structure>, PassRefPtr<StyleSheet>); virtual ~JSStyleSheet(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void mark(); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); StyleSheet* impl() const { return m_impl.get(); } private: RefPtr<StyleSheet> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, StyleSheet*); -StyleSheet* toStyleSheet(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, StyleSheet*); +StyleSheet* toStyleSheet(JSC::JSValue); class JSStyleSheetPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSStyleSheetPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -67,15 +68,15 @@ public: // Attributes -JSC::JSValuePtr jsStyleSheetType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsStyleSheetDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSStyleSheetDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsStyleSheetOwnerNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsStyleSheetParentStyleSheet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsStyleSheetHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsStyleSheetTitle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsStyleSheetMedia(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsStyleSheetConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStyleSheetType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStyleSheetDisabled(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSStyleSheetDisabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsStyleSheetOwnerNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStyleSheetParentStyleSheet(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStyleSheetHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStyleSheetTitle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStyleSheetMedia(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStyleSheetConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSStyleSheetList.cpp b/src/3rdparty/webkit/WebCore/generated/JSStyleSheetList.cpp index fc4396c192..898b3bee11 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSStyleSheetList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSStyleSheetList.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSStyleSheetList) +ASSERT_CLASS_FITS_IN_CELL(JSStyleSheetList); /* Hash table */ @@ -74,13 +74,13 @@ public: JSStyleSheetListConstructor(ExecState* exec) : DOMObject(JSStyleSheetListConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSStyleSheetListPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSStyleSheetListPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -110,9 +110,9 @@ static const HashTable JSStyleSheetListPrototypeTable = const ClassInfo JSStyleSheetListPrototype::s_info = { "StyleSheetListPrototype", 0, &JSStyleSheetListPrototypeTable, 0 }; -JSObject* JSStyleSheetListPrototype::self(ExecState* exec) +JSObject* JSStyleSheetListPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSStyleSheetList>(exec); + return getDOMPrototype<JSStyleSheetList>(exec, globalObject); } bool JSStyleSheetListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -131,12 +131,11 @@ JSStyleSheetList::JSStyleSheetList(PassRefPtr<Structure> structure, PassRefPtr<S JSStyleSheetList::~JSStyleSheetList() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSStyleSheetList::createPrototype(ExecState* exec) +JSObject* JSStyleSheetList::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSStyleSheetListPrototype(JSStyleSheetListPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSStyleSheetListPrototype(JSStyleSheetListPrototype::createStructure(globalObject->objectPrototype())); } bool JSStyleSheetList::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -168,13 +167,14 @@ bool JSStyleSheetList::getOwnPropertySlot(ExecState* exec, unsigned propertyName return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -JSValuePtr jsStyleSheetListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStyleSheetListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); StyleSheetList* imp = static_cast<StyleSheetList*>(static_cast<JSStyleSheetList*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsStyleSheetListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsStyleSheetListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSStyleSheetList*>(asObject(slot.slotBase()))->getConstructor(exec); } @@ -185,37 +185,38 @@ void JSStyleSheetList::getPropertyNames(ExecState* exec, PropertyNameArray& prop Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSStyleSheetList::getConstructor(ExecState* exec) +JSValue JSStyleSheetList::getConstructor(ExecState* exec) { return getDOMConstructor<JSStyleSheetListConstructor>(exec); } -JSValuePtr jsStyleSheetListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsStyleSheetListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSStyleSheetList::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSStyleSheetList::s_info)) return throwError(exec, TypeError); JSStyleSheetList* castedThisObj = static_cast<JSStyleSheetList*>(asObject(thisValue)); StyleSheetList* imp = static_cast<StyleSheetList*>(castedThisObj->impl()); - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); return result; } -JSValuePtr JSStyleSheetList::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue JSStyleSheetList::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSStyleSheetList* thisObj = static_cast<JSStyleSheetList*>(asObject(slot.slotBase())); return toJS(exec, static_cast<StyleSheetList*>(thisObj->impl())->item(slot.index())); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, StyleSheetList* object) +JSC::JSValue toJS(JSC::ExecState* exec, StyleSheetList* object) { return getDOMObjectWrapper<JSStyleSheetList>(exec, object); } -StyleSheetList* toStyleSheetList(JSC::JSValuePtr value) +StyleSheetList* toStyleSheetList(JSC::JSValue value) { - return value->isObject(&JSStyleSheetList::s_info) ? static_cast<JSStyleSheetList*>(asObject(value))->impl() : 0; + return value.isObject(&JSStyleSheetList::s_info) ? static_cast<JSStyleSheetList*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSStyleSheetList.h b/src/3rdparty/webkit/WebCore/generated/JSStyleSheetList.h index f9edf94300..bb06c58ffc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSStyleSheetList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSStyleSheetList.h @@ -34,39 +34,40 @@ class JSStyleSheetList : public DOMObject { public: JSStyleSheetList(PassRefPtr<JSC::Structure>, PassRefPtr<StyleSheetList>); virtual ~JSStyleSheetList(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); StyleSheetList* impl() const { return m_impl.get(); } private: RefPtr<StyleSheetList> m_impl; - static JSC::JSValuePtr indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); private: static bool canGetItemsForName(JSC::ExecState*, StyleSheetList*, const JSC::Identifier&); - static JSC::JSValuePtr nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValuePtr toJS(JSC::ExecState*, StyleSheetList*); -StyleSheetList* toStyleSheetList(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, StyleSheetList*); +StyleSheetList* toStyleSheetList(JSC::JSValue); class JSStyleSheetListPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -75,11 +76,11 @@ public: // Functions -JSC::JSValuePtr jsStyleSheetListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsStyleSheetListPrototypeFunctionItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsStyleSheetListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsStyleSheetListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStyleSheetListLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsStyleSheetListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSText.cpp b/src/3rdparty/webkit/WebCore/generated/JSText.cpp index 053e28066a..c6f306f0c8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSText.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSText.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSText) +ASSERT_CLASS_FITS_IN_CELL(JSText); /* Hash table */ @@ -74,13 +74,13 @@ public: JSTextConstructor(ExecState* exec) : DOMObject(JSTextConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSTextPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSTextPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -111,9 +111,9 @@ static const HashTable JSTextPrototypeTable = const ClassInfo JSTextPrototype::s_info = { "TextPrototype", 0, &JSTextPrototypeTable, 0 }; -JSObject* JSTextPrototype::self(ExecState* exec) +JSObject* JSTextPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSText>(exec); + return getDOMPrototype<JSText>(exec, globalObject); } bool JSTextPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,9 +128,9 @@ JSText::JSText(PassRefPtr<Structure> structure, PassRefPtr<Text> impl) { } -JSObject* JSText::createPrototype(ExecState* exec) +JSObject* JSText::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSTextPrototype(JSTextPrototype::createStructure(JSCharacterDataPrototype::self(exec))); + return new (exec) JSTextPrototype(JSTextPrototype::createStructure(JSCharacterDataPrototype::self(exec, globalObject))); } bool JSText::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -138,51 +138,54 @@ bool JSText::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, return getStaticValueSlot<JSText, Base>(exec, &JSTextTable, this, propertyName, slot); } -JSValuePtr jsTextWholeText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsTextWholeText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Text* imp = static_cast<Text*>(static_cast<JSText*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->wholeText()); } -JSValuePtr jsTextConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsTextConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSText*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSText::getConstructor(ExecState* exec) +JSValue JSText::getConstructor(ExecState* exec) { return getDOMConstructor<JSTextConstructor>(exec); } -JSValuePtr jsTextPrototypeFunctionSplitText(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsTextPrototypeFunctionSplitText(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSText::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSText::s_info)) return throwError(exec, TypeError); JSText* castedThisObj = static_cast<JSText*>(asObject(thisValue)); Text* imp = static_cast<Text*>(castedThisObj->impl()); ExceptionCode ec = 0; - int offset = args.at(exec, 0)->toInt32(exec); + int offset = args.at(0).toInt32(exec); if (offset < 0) { setDOMException(exec, INDEX_SIZE_ERR); return jsUndefined(); } - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->splitText(offset, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->splitText(offset, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsTextPrototypeFunctionReplaceWholeText(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsTextPrototypeFunctionReplaceWholeText(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSText::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSText::s_info)) return throwError(exec, TypeError); JSText* castedThisObj = static_cast<JSText*>(asObject(thisValue)); Text* imp = static_cast<Text*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& content = args.at(exec, 0)->toString(exec); + const UString& content = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->replaceWholeText(content, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->replaceWholeText(content, ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSText.h b/src/3rdparty/webkit/WebCore/generated/JSText.h index e5972440e0..e489274f78 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSText.h +++ b/src/3rdparty/webkit/WebCore/generated/JSText.h @@ -31,27 +31,29 @@ class JSText : public JSCharacterData { typedef JSCharacterData Base; public: JSText(PassRefPtr<JSC::Structure>, PassRefPtr<Text>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; +JSC::JSValue toJSNewlyCreated(JSC::ExecState*, Text*); class JSTextPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,12 +62,12 @@ public: // Functions -JSC::JSValuePtr jsTextPrototypeFunctionSplitText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsTextPrototypeFunctionReplaceWholeText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsTextPrototypeFunctionSplitText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsTextPrototypeFunctionReplaceWholeText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsTextWholeText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsTextConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsTextWholeText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsTextConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSTextEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSTextEvent.cpp index 857faabc51..fe7fc2af48 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSTextEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSTextEvent.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSTextEvent) +ASSERT_CLASS_FITS_IN_CELL(JSTextEvent); /* Hash table */ @@ -73,13 +73,13 @@ public: JSTextEventConstructor(ExecState* exec) : DOMObject(JSTextEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSTextEventPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSTextEventPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -109,9 +109,9 @@ static const HashTable JSTextEventPrototypeTable = const ClassInfo JSTextEventPrototype::s_info = { "TextEventPrototype", 0, &JSTextEventPrototypeTable, 0 }; -JSObject* JSTextEventPrototype::self(ExecState* exec) +JSObject* JSTextEventPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSTextEvent>(exec); + return getDOMPrototype<JSTextEvent>(exec, globalObject); } bool JSTextEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -126,9 +126,9 @@ JSTextEvent::JSTextEvent(PassRefPtr<Structure> structure, PassRefPtr<TextEvent> { } -JSObject* JSTextEvent::createPrototype(ExecState* exec) +JSObject* JSTextEvent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSTextEventPrototype(JSTextEventPrototype::createStructure(JSUIEventPrototype::self(exec))); + return new (exec) JSTextEventPrototype(JSTextEventPrototype::createStructure(JSUIEventPrototype::self(exec, globalObject))); } bool JSTextEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -136,32 +136,34 @@ bool JSTextEvent::getOwnPropertySlot(ExecState* exec, const Identifier& property return getStaticValueSlot<JSTextEvent, Base>(exec, &JSTextEventTable, this, propertyName, slot); } -JSValuePtr jsTextEventData(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsTextEventData(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); TextEvent* imp = static_cast<TextEvent*>(static_cast<JSTextEvent*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->data()); } -JSValuePtr jsTextEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsTextEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSTextEvent*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSTextEvent::getConstructor(ExecState* exec) +JSValue JSTextEvent::getConstructor(ExecState* exec) { return getDOMConstructor<JSTextEventConstructor>(exec); } -JSValuePtr jsTextEventPrototypeFunctionInitTextEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsTextEventPrototypeFunctionInitTextEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSTextEvent::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSTextEvent::s_info)) return throwError(exec, TypeError); JSTextEvent* castedThisObj = static_cast<JSTextEvent*>(asObject(thisValue)); TextEvent* imp = static_cast<TextEvent*>(castedThisObj->impl()); - const UString& typeArg = args.at(exec, 0)->toString(exec); - bool canBubbleArg = args.at(exec, 1)->toBoolean(exec); - bool cancelableArg = args.at(exec, 2)->toBoolean(exec); - DOMWindow* viewArg = toDOMWindow(args.at(exec, 3)); - const UString& dataArg = args.at(exec, 4)->toString(exec); + const UString& typeArg = args.at(0).toString(exec); + bool canBubbleArg = args.at(1).toBoolean(exec); + bool cancelableArg = args.at(2).toBoolean(exec); + DOMWindow* viewArg = toDOMWindow(args.at(3)); + const UString& dataArg = args.at(4).toString(exec); imp->initTextEvent(typeArg, canBubbleArg, cancelableArg, viewArg, dataArg); return jsUndefined(); diff --git a/src/3rdparty/webkit/WebCore/generated/JSTextEvent.h b/src/3rdparty/webkit/WebCore/generated/JSTextEvent.h index b4cd3b561b..08f014173c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSTextEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSTextEvent.h @@ -31,27 +31,28 @@ class JSTextEvent : public JSUIEvent { typedef JSUIEvent Base; public: JSTextEvent(PassRefPtr<JSC::Structure>, PassRefPtr<TextEvent>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSTextEventPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,11 +61,11 @@ public: // Functions -JSC::JSValuePtr jsTextEventPrototypeFunctionInitTextEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsTextEventPrototypeFunctionInitTextEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsTextEventData(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsTextEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsTextEventData(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsTextEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSTextMetrics.cpp b/src/3rdparty/webkit/WebCore/generated/JSTextMetrics.cpp index 5b31aeb2c7..fcc384a39a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSTextMetrics.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSTextMetrics.cpp @@ -32,7 +32,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSTextMetrics) +ASSERT_CLASS_FITS_IN_CELL(JSTextMetrics); /* Hash table */ @@ -69,13 +69,13 @@ public: JSTextMetricsConstructor(ExecState* exec) : DOMObject(JSTextMetricsConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSTextMetricsPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSTextMetricsPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -104,9 +104,9 @@ static const HashTable JSTextMetricsPrototypeTable = const ClassInfo JSTextMetricsPrototype::s_info = { "TextMetricsPrototype", 0, &JSTextMetricsPrototypeTable, 0 }; -JSObject* JSTextMetricsPrototype::self(ExecState* exec) +JSObject* JSTextMetricsPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSTextMetrics>(exec); + return getDOMPrototype<JSTextMetrics>(exec, globalObject); } const ClassInfo JSTextMetrics::s_info = { "TextMetrics", 0, &JSTextMetricsTable, 0 }; @@ -120,12 +120,11 @@ JSTextMetrics::JSTextMetrics(PassRefPtr<Structure> structure, PassRefPtr<TextMet JSTextMetrics::~JSTextMetrics() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSTextMetrics::createPrototype(ExecState* exec) +JSObject* JSTextMetrics::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSTextMetricsPrototype(JSTextMetricsPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSTextMetricsPrototype(JSTextMetricsPrototype::createStructure(globalObject->objectPrototype())); } bool JSTextMetrics::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -133,28 +132,29 @@ bool JSTextMetrics::getOwnPropertySlot(ExecState* exec, const Identifier& proper return getStaticValueSlot<JSTextMetrics, Base>(exec, &JSTextMetricsTable, this, propertyName, slot); } -JSValuePtr jsTextMetricsWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsTextMetricsWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); TextMetrics* imp = static_cast<TextMetrics*>(static_cast<JSTextMetrics*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->width()); } -JSValuePtr jsTextMetricsConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsTextMetricsConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSTextMetrics*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSTextMetrics::getConstructor(ExecState* exec) +JSValue JSTextMetrics::getConstructor(ExecState* exec) { return getDOMConstructor<JSTextMetricsConstructor>(exec); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, TextMetrics* object) +JSC::JSValue toJS(JSC::ExecState* exec, TextMetrics* object) { return getDOMObjectWrapper<JSTextMetrics>(exec, object); } -TextMetrics* toTextMetrics(JSC::JSValuePtr value) +TextMetrics* toTextMetrics(JSC::JSValue value) { - return value->isObject(&JSTextMetrics::s_info) ? static_cast<JSTextMetrics*>(asObject(value))->impl() : 0; + return value.isObject(&JSTextMetrics::s_info) ? static_cast<JSTextMetrics*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSTextMetrics.h b/src/3rdparty/webkit/WebCore/generated/JSTextMetrics.h index 5065932033..4fb044fa7d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSTextMetrics.h +++ b/src/3rdparty/webkit/WebCore/generated/JSTextMetrics.h @@ -34,29 +34,30 @@ class JSTextMetrics : public DOMObject { public: JSTextMetrics(PassRefPtr<JSC::Structure>, PassRefPtr<TextMetrics>); virtual ~JSTextMetrics(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); TextMetrics* impl() const { return m_impl.get(); } private: RefPtr<TextMetrics> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, TextMetrics*); -TextMetrics* toTextMetrics(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, TextMetrics*); +TextMetrics* toTextMetrics(JSC::JSValue); class JSTextMetricsPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSTextMetricsPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -64,8 +65,8 @@ public: // Attributes -JSC::JSValuePtr jsTextMetricsWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsTextMetricsConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsTextMetricsWidth(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsTextMetricsConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSTimeRanges.cpp b/src/3rdparty/webkit/WebCore/generated/JSTimeRanges.cpp index 1ba0cd4246..f2ea67b078 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSTimeRanges.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSTimeRanges.cpp @@ -33,7 +33,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSTimeRanges) +ASSERT_CLASS_FITS_IN_CELL(JSTimeRanges); /* Hash table */ @@ -68,9 +68,9 @@ static const HashTable JSTimeRangesPrototypeTable = const ClassInfo JSTimeRangesPrototype::s_info = { "TimeRangesPrototype", 0, &JSTimeRangesPrototypeTable, 0 }; -JSObject* JSTimeRangesPrototype::self(ExecState* exec) +JSObject* JSTimeRangesPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSTimeRanges>(exec); + return getDOMPrototype<JSTimeRanges>(exec, globalObject); } bool JSTimeRangesPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -89,12 +89,11 @@ JSTimeRanges::JSTimeRanges(PassRefPtr<Structure> structure, PassRefPtr<TimeRange JSTimeRanges::~JSTimeRanges() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSTimeRanges::createPrototype(ExecState* exec) +JSObject* JSTimeRanges::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSTimeRangesPrototype(JSTimeRangesPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSTimeRangesPrototype(JSTimeRangesPrototype::createStructure(globalObject->objectPrototype())); } bool JSTimeRanges::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -102,49 +101,52 @@ bool JSTimeRanges::getOwnPropertySlot(ExecState* exec, const Identifier& propert return getStaticValueSlot<JSTimeRanges, Base>(exec, &JSTimeRangesTable, this, propertyName, slot); } -JSValuePtr jsTimeRangesLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsTimeRangesLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); TimeRanges* imp = static_cast<TimeRanges*>(static_cast<JSTimeRanges*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->length()); } -JSValuePtr jsTimeRangesPrototypeFunctionStart(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsTimeRangesPrototypeFunctionStart(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSTimeRanges::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSTimeRanges::s_info)) return throwError(exec, TypeError); JSTimeRanges* castedThisObj = static_cast<JSTimeRanges*>(asObject(thisValue)); TimeRanges* imp = static_cast<TimeRanges*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = jsNumber(exec, imp->start(index, ec)); + JSC::JSValue result = jsNumber(exec, imp->start(index, ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsTimeRangesPrototypeFunctionEnd(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsTimeRangesPrototypeFunctionEnd(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSTimeRanges::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSTimeRanges::s_info)) return throwError(exec, TypeError); JSTimeRanges* castedThisObj = static_cast<JSTimeRanges*>(asObject(thisValue)); TimeRanges* imp = static_cast<TimeRanges*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = jsNumber(exec, imp->end(index, ec)); + JSC::JSValue result = jsNumber(exec, imp->end(index, ec)); setDOMException(exec, ec); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, TimeRanges* object) +JSC::JSValue toJS(JSC::ExecState* exec, TimeRanges* object) { return getDOMObjectWrapper<JSTimeRanges>(exec, object); } -TimeRanges* toTimeRanges(JSC::JSValuePtr value) +TimeRanges* toTimeRanges(JSC::JSValue value) { - return value->isObject(&JSTimeRanges::s_info) ? static_cast<JSTimeRanges*>(asObject(value))->impl() : 0; + return value.isObject(&JSTimeRanges::s_info) ? static_cast<JSTimeRanges*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSTimeRanges.h b/src/3rdparty/webkit/WebCore/generated/JSTimeRanges.h index 0032039000..41da9efed4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSTimeRanges.h +++ b/src/3rdparty/webkit/WebCore/generated/JSTimeRanges.h @@ -34,12 +34,12 @@ class JSTimeRanges : public DOMObject { public: JSTimeRanges(PassRefPtr<JSC::Structure>, PassRefPtr<TimeRanges>); virtual ~JSTimeRanges(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -50,16 +50,17 @@ private: RefPtr<TimeRanges> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, TimeRanges*); -TimeRanges* toTimeRanges(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, TimeRanges*); +TimeRanges* toTimeRanges(JSC::JSValue); class JSTimeRangesPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -68,11 +69,11 @@ public: // Functions -JSC::JSValuePtr jsTimeRangesPrototypeFunctionStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsTimeRangesPrototypeFunctionEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsTimeRangesPrototypeFunctionStart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsTimeRangesPrototypeFunctionEnd(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsTimeRangesLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsTimeRangesLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSTreeWalker.cpp b/src/3rdparty/webkit/WebCore/generated/JSTreeWalker.cpp index 31214a637d..209a539be2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSTreeWalker.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSTreeWalker.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSTreeWalker) +ASSERT_CLASS_FITS_IN_CELL(JSTreeWalker); /* Hash table */ @@ -78,13 +78,13 @@ public: JSTreeWalkerConstructor(ExecState* exec) : DOMObject(JSTreeWalkerConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSTreeWalkerPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSTreeWalkerPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -120,9 +120,9 @@ static const HashTable JSTreeWalkerPrototypeTable = const ClassInfo JSTreeWalkerPrototype::s_info = { "TreeWalkerPrototype", 0, &JSTreeWalkerPrototypeTable, 0 }; -JSObject* JSTreeWalkerPrototype::self(ExecState* exec) +JSObject* JSTreeWalkerPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSTreeWalker>(exec); + return getDOMPrototype<JSTreeWalker>(exec, globalObject); } bool JSTreeWalkerPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -141,12 +141,11 @@ JSTreeWalker::JSTreeWalker(PassRefPtr<Structure> structure, PassRefPtr<TreeWalke JSTreeWalker::~JSTreeWalker() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSTreeWalker::createPrototype(ExecState* exec) +JSObject* JSTreeWalker::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSTreeWalkerPrototype(JSTreeWalkerPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSTreeWalkerPrototype(JSTreeWalkerPrototype::createStructure(globalObject->objectPrototype())); } bool JSTreeWalker::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -154,46 +153,51 @@ bool JSTreeWalker::getOwnPropertySlot(ExecState* exec, const Identifier& propert return getStaticValueSlot<JSTreeWalker, Base>(exec, &JSTreeWalkerTable, this, propertyName, slot); } -JSValuePtr jsTreeWalkerRoot(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsTreeWalkerRoot(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); TreeWalker* imp = static_cast<TreeWalker*>(static_cast<JSTreeWalker*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->root())); } -JSValuePtr jsTreeWalkerWhatToShow(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsTreeWalkerWhatToShow(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); TreeWalker* imp = static_cast<TreeWalker*>(static_cast<JSTreeWalker*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->whatToShow()); } -JSValuePtr jsTreeWalkerFilter(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsTreeWalkerFilter(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); TreeWalker* imp = static_cast<TreeWalker*>(static_cast<JSTreeWalker*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->filter())); } -JSValuePtr jsTreeWalkerExpandEntityReferences(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsTreeWalkerExpandEntityReferences(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); TreeWalker* imp = static_cast<TreeWalker*>(static_cast<JSTreeWalker*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->expandEntityReferences()); } -JSValuePtr jsTreeWalkerCurrentNode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsTreeWalkerCurrentNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); TreeWalker* imp = static_cast<TreeWalker*>(static_cast<JSTreeWalker*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->currentNode())); } -JSValuePtr jsTreeWalkerConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsTreeWalkerConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSTreeWalker*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSTreeWalker::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSTreeWalker::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSTreeWalker, Base>(exec, propertyName, value, &JSTreeWalkerTable, this, slot); } -void setJSTreeWalkerCurrentNode(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSTreeWalkerCurrentNode(ExecState* exec, JSObject* thisObject, JSValue value) { TreeWalker* imp = static_cast<TreeWalker*>(static_cast<JSTreeWalker*>(thisObject)->impl()); ExceptionCode ec = 0; @@ -201,74 +205,81 @@ void setJSTreeWalkerCurrentNode(ExecState* exec, JSObject* thisObject, JSValuePt setDOMException(exec, ec); } -JSValuePtr JSTreeWalker::getConstructor(ExecState* exec) +JSValue JSTreeWalker::getConstructor(ExecState* exec) { return getDOMConstructor<JSTreeWalkerConstructor>(exec); } -JSValuePtr jsTreeWalkerPrototypeFunctionParentNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsTreeWalkerPrototypeFunctionParentNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSTreeWalker::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSTreeWalker::s_info)) return throwError(exec, TypeError); JSTreeWalker* castedThisObj = static_cast<JSTreeWalker*>(asObject(thisValue)); return castedThisObj->parentNode(exec, args); } -JSValuePtr jsTreeWalkerPrototypeFunctionFirstChild(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsTreeWalkerPrototypeFunctionFirstChild(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSTreeWalker::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSTreeWalker::s_info)) return throwError(exec, TypeError); JSTreeWalker* castedThisObj = static_cast<JSTreeWalker*>(asObject(thisValue)); return castedThisObj->firstChild(exec, args); } -JSValuePtr jsTreeWalkerPrototypeFunctionLastChild(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsTreeWalkerPrototypeFunctionLastChild(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSTreeWalker::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSTreeWalker::s_info)) return throwError(exec, TypeError); JSTreeWalker* castedThisObj = static_cast<JSTreeWalker*>(asObject(thisValue)); return castedThisObj->lastChild(exec, args); } -JSValuePtr jsTreeWalkerPrototypeFunctionPreviousSibling(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsTreeWalkerPrototypeFunctionPreviousSibling(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSTreeWalker::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSTreeWalker::s_info)) return throwError(exec, TypeError); JSTreeWalker* castedThisObj = static_cast<JSTreeWalker*>(asObject(thisValue)); return castedThisObj->previousSibling(exec, args); } -JSValuePtr jsTreeWalkerPrototypeFunctionNextSibling(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsTreeWalkerPrototypeFunctionNextSibling(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSTreeWalker::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSTreeWalker::s_info)) return throwError(exec, TypeError); JSTreeWalker* castedThisObj = static_cast<JSTreeWalker*>(asObject(thisValue)); return castedThisObj->nextSibling(exec, args); } -JSValuePtr jsTreeWalkerPrototypeFunctionPreviousNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsTreeWalkerPrototypeFunctionPreviousNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSTreeWalker::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSTreeWalker::s_info)) return throwError(exec, TypeError); JSTreeWalker* castedThisObj = static_cast<JSTreeWalker*>(asObject(thisValue)); return castedThisObj->previousNode(exec, args); } -JSValuePtr jsTreeWalkerPrototypeFunctionNextNode(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsTreeWalkerPrototypeFunctionNextNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSTreeWalker::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSTreeWalker::s_info)) return throwError(exec, TypeError); JSTreeWalker* castedThisObj = static_cast<JSTreeWalker*>(asObject(thisValue)); return castedThisObj->nextNode(exec, args); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, TreeWalker* object) +JSC::JSValue toJS(JSC::ExecState* exec, TreeWalker* object) { return getDOMObjectWrapper<JSTreeWalker>(exec, object); } -TreeWalker* toTreeWalker(JSC::JSValuePtr value) +TreeWalker* toTreeWalker(JSC::JSValue value) { - return value->isObject(&JSTreeWalker::s_info) ? static_cast<JSTreeWalker*>(asObject(value))->impl() : 0; + return value.isObject(&JSTreeWalker::s_info) ? static_cast<JSTreeWalker*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSTreeWalker.h b/src/3rdparty/webkit/WebCore/generated/JSTreeWalker.h index 537891528f..92b42bf4ea 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSTreeWalker.h +++ b/src/3rdparty/webkit/WebCore/generated/JSTreeWalker.h @@ -34,45 +34,46 @@ class JSTreeWalker : public DOMObject { public: JSTreeWalker(PassRefPtr<JSC::Structure>, PassRefPtr<TreeWalker>); virtual ~JSTreeWalker(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void mark(); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom functions - JSC::JSValuePtr parentNode(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr firstChild(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr lastChild(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr previousSibling(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr nextSibling(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr previousNode(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr nextNode(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue parentNode(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue firstChild(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue lastChild(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue previousSibling(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue nextSibling(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue previousNode(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue nextNode(JSC::ExecState*, const JSC::ArgList&); TreeWalker* impl() const { return m_impl.get(); } private: RefPtr<TreeWalker> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, TreeWalker*); -TreeWalker* toTreeWalker(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, TreeWalker*); +TreeWalker* toTreeWalker(JSC::JSValue); class JSTreeWalkerPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -81,22 +82,22 @@ public: // Functions -JSC::JSValuePtr jsTreeWalkerPrototypeFunctionParentNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsTreeWalkerPrototypeFunctionFirstChild(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsTreeWalkerPrototypeFunctionLastChild(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsTreeWalkerPrototypeFunctionPreviousSibling(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsTreeWalkerPrototypeFunctionNextSibling(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsTreeWalkerPrototypeFunctionPreviousNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsTreeWalkerPrototypeFunctionNextNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsTreeWalkerPrototypeFunctionParentNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsTreeWalkerPrototypeFunctionFirstChild(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsTreeWalkerPrototypeFunctionLastChild(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsTreeWalkerPrototypeFunctionPreviousSibling(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsTreeWalkerPrototypeFunctionNextSibling(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsTreeWalkerPrototypeFunctionPreviousNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsTreeWalkerPrototypeFunctionNextNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsTreeWalkerRoot(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsTreeWalkerWhatToShow(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsTreeWalkerFilter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsTreeWalkerExpandEntityReferences(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsTreeWalkerCurrentNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSTreeWalkerCurrentNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsTreeWalkerConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsTreeWalkerRoot(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsTreeWalkerWhatToShow(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsTreeWalkerFilter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsTreeWalkerExpandEntityReferences(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsTreeWalkerCurrentNode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSTreeWalkerCurrentNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsTreeWalkerConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSUIEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSUIEvent.cpp index 1b959364c0..d838bd434e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSUIEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSUIEvent.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSUIEvent) +ASSERT_CLASS_FITS_IN_CELL(JSUIEvent); /* Hash table */ @@ -80,13 +80,13 @@ public: JSUIEventConstructor(ExecState* exec) : DOMObject(JSUIEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSUIEventPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSUIEventPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -116,9 +116,9 @@ static const HashTable JSUIEventPrototypeTable = const ClassInfo JSUIEventPrototype::s_info = { "UIEventPrototype", 0, &JSUIEventPrototypeTable, 0 }; -JSObject* JSUIEventPrototype::self(ExecState* exec) +JSObject* JSUIEventPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSUIEvent>(exec); + return getDOMPrototype<JSUIEvent>(exec, globalObject); } bool JSUIEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -133,9 +133,9 @@ JSUIEvent::JSUIEvent(PassRefPtr<Structure> structure, PassRefPtr<UIEvent> impl) { } -JSObject* JSUIEvent::createPrototype(ExecState* exec) +JSObject* JSUIEvent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSUIEventPrototype(JSUIEventPrototype::createStructure(JSEventPrototype::self(exec))); + return new (exec) JSUIEventPrototype(JSUIEventPrototype::createStructure(JSEventPrototype::self(exec, globalObject))); } bool JSUIEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -143,80 +143,90 @@ bool JSUIEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa return getStaticValueSlot<JSUIEvent, Base>(exec, &JSUIEventTable, this, propertyName, slot); } -JSValuePtr jsUIEventView(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsUIEventView(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); UIEvent* imp = static_cast<UIEvent*>(static_cast<JSUIEvent*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->view())); } -JSValuePtr jsUIEventDetail(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsUIEventDetail(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); UIEvent* imp = static_cast<UIEvent*>(static_cast<JSUIEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->detail()); } -JSValuePtr jsUIEventKeyCode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsUIEventKeyCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); UIEvent* imp = static_cast<UIEvent*>(static_cast<JSUIEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->keyCode()); } -JSValuePtr jsUIEventCharCode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsUIEventCharCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); UIEvent* imp = static_cast<UIEvent*>(static_cast<JSUIEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->charCode()); } -JSValuePtr jsUIEventLayerX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsUIEventLayerX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); UIEvent* imp = static_cast<UIEvent*>(static_cast<JSUIEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->layerX()); } -JSValuePtr jsUIEventLayerY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsUIEventLayerY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); UIEvent* imp = static_cast<UIEvent*>(static_cast<JSUIEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->layerY()); } -JSValuePtr jsUIEventPageX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsUIEventPageX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); UIEvent* imp = static_cast<UIEvent*>(static_cast<JSUIEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->pageX()); } -JSValuePtr jsUIEventPageY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsUIEventPageY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); UIEvent* imp = static_cast<UIEvent*>(static_cast<JSUIEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->pageY()); } -JSValuePtr jsUIEventWhich(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsUIEventWhich(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); UIEvent* imp = static_cast<UIEvent*>(static_cast<JSUIEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->which()); } -JSValuePtr jsUIEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsUIEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSUIEvent*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSUIEvent::getConstructor(ExecState* exec) +JSValue JSUIEvent::getConstructor(ExecState* exec) { return getDOMConstructor<JSUIEventConstructor>(exec); } -JSValuePtr jsUIEventPrototypeFunctionInitUIEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsUIEventPrototypeFunctionInitUIEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSUIEvent::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSUIEvent::s_info)) return throwError(exec, TypeError); JSUIEvent* castedThisObj = static_cast<JSUIEvent*>(asObject(thisValue)); UIEvent* imp = static_cast<UIEvent*>(castedThisObj->impl()); - const UString& type = args.at(exec, 0)->toString(exec); - bool canBubble = args.at(exec, 1)->toBoolean(exec); - bool cancelable = args.at(exec, 2)->toBoolean(exec); - DOMWindow* view = toDOMWindow(args.at(exec, 3)); - int detail = args.at(exec, 4)->toInt32(exec); + const UString& type = args.at(0).toString(exec); + bool canBubble = args.at(1).toBoolean(exec); + bool cancelable = args.at(2).toBoolean(exec); + DOMWindow* view = toDOMWindow(args.at(3)); + int detail = args.at(4).toInt32(exec); imp->initUIEvent(type, canBubble, cancelable, view, detail); return jsUndefined(); diff --git a/src/3rdparty/webkit/WebCore/generated/JSUIEvent.h b/src/3rdparty/webkit/WebCore/generated/JSUIEvent.h index b8b0e62c7a..3999438014 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSUIEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSUIEvent.h @@ -31,27 +31,28 @@ class JSUIEvent : public JSEvent { typedef JSEvent Base; public: JSUIEvent(PassRefPtr<JSC::Structure>, PassRefPtr<UIEvent>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSUIEventPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,19 +61,19 @@ public: // Functions -JSC::JSValuePtr jsUIEventPrototypeFunctionInitUIEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsUIEventPrototypeFunctionInitUIEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsUIEventView(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsUIEventDetail(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsUIEventKeyCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsUIEventCharCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsUIEventLayerX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsUIEventLayerY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsUIEventPageX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsUIEventPageY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsUIEventWhich(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsUIEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsUIEventView(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsUIEventDetail(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsUIEventKeyCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsUIEventCharCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsUIEventLayerX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsUIEventLayerY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsUIEventPageX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsUIEventPageY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsUIEventWhich(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsUIEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSVoidCallback.cpp b/src/3rdparty/webkit/WebCore/generated/JSVoidCallback.cpp index d11a11ad45..6b1db4bb6b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSVoidCallback.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSVoidCallback.cpp @@ -32,7 +32,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSVoidCallback) +ASSERT_CLASS_FITS_IN_CELL(JSVoidCallback); /* Hash table for prototype */ @@ -51,9 +51,9 @@ static const HashTable JSVoidCallbackPrototypeTable = const ClassInfo JSVoidCallbackPrototype::s_info = { "VoidCallbackPrototype", 0, &JSVoidCallbackPrototypeTable, 0 }; -JSObject* JSVoidCallbackPrototype::self(ExecState* exec) +JSObject* JSVoidCallbackPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSVoidCallback>(exec); + return getDOMPrototype<JSVoidCallback>(exec, globalObject); } bool JSVoidCallbackPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -72,17 +72,17 @@ JSVoidCallback::JSVoidCallback(PassRefPtr<Structure> structure, PassRefPtr<VoidC JSVoidCallback::~JSVoidCallback() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSVoidCallback::createPrototype(ExecState* exec) +JSObject* JSVoidCallback::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSVoidCallbackPrototype(JSVoidCallbackPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSVoidCallbackPrototype(JSVoidCallbackPrototype::createStructure(globalObject->objectPrototype())); } -JSValuePtr jsVoidCallbackPrototypeFunctionHandleEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsVoidCallbackPrototypeFunctionHandleEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSVoidCallback::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSVoidCallback::s_info)) return throwError(exec, TypeError); JSVoidCallback* castedThisObj = static_cast<JSVoidCallback*>(asObject(thisValue)); VoidCallback* imp = static_cast<VoidCallback*>(castedThisObj->impl()); @@ -91,7 +91,7 @@ JSValuePtr jsVoidCallbackPrototypeFunctionHandleEvent(ExecState* exec, JSObject* return jsUndefined(); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, VoidCallback* object) +JSC::JSValue toJS(JSC::ExecState* exec, VoidCallback* object) { return getDOMObjectWrapper<JSVoidCallback>(exec, object); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSVoidCallback.h b/src/3rdparty/webkit/WebCore/generated/JSVoidCallback.h index 5da934fb19..ac05cb9d12 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSVoidCallback.h +++ b/src/3rdparty/webkit/WebCore/generated/JSVoidCallback.h @@ -34,7 +34,7 @@ class JSVoidCallback : public DOMObject { public: JSVoidCallback(PassRefPtr<JSC::Structure>, PassRefPtr<VoidCallback>); virtual ~JSVoidCallback(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -44,16 +44,17 @@ private: RefPtr<VoidCallback> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, VoidCallback*); -VoidCallback* toVoidCallback(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, VoidCallback*); +VoidCallback* toVoidCallback(JSC::JSValue); class JSVoidCallbackPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -62,7 +63,7 @@ public: // Functions -JSC::JSValuePtr jsVoidCallbackPrototypeFunctionHandleEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsVoidCallbackPrototypeFunctionHandleEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitAnimationEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSWebKitAnimationEvent.cpp index f2356ec52d..7e0b292b90 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitAnimationEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitAnimationEvent.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSWebKitAnimationEvent) +ASSERT_CLASS_FITS_IN_CELL(JSWebKitAnimationEvent); /* Hash table */ @@ -73,13 +73,13 @@ public: JSWebKitAnimationEventConstructor(ExecState* exec) : DOMObject(JSWebKitAnimationEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSWebKitAnimationEventPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSWebKitAnimationEventPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -109,9 +109,9 @@ static const HashTable JSWebKitAnimationEventPrototypeTable = const ClassInfo JSWebKitAnimationEventPrototype::s_info = { "WebKitAnimationEventPrototype", 0, &JSWebKitAnimationEventPrototypeTable, 0 }; -JSObject* JSWebKitAnimationEventPrototype::self(ExecState* exec) +JSObject* JSWebKitAnimationEventPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSWebKitAnimationEvent>(exec); + return getDOMPrototype<JSWebKitAnimationEvent>(exec, globalObject); } bool JSWebKitAnimationEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -126,9 +126,9 @@ JSWebKitAnimationEvent::JSWebKitAnimationEvent(PassRefPtr<Structure> structure, { } -JSObject* JSWebKitAnimationEvent::createPrototype(ExecState* exec) +JSObject* JSWebKitAnimationEvent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSWebKitAnimationEventPrototype(JSWebKitAnimationEventPrototype::createStructure(JSEventPrototype::self(exec))); + return new (exec) JSWebKitAnimationEventPrototype(JSWebKitAnimationEventPrototype::createStructure(JSEventPrototype::self(exec, globalObject))); } bool JSWebKitAnimationEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -136,38 +136,41 @@ bool JSWebKitAnimationEvent::getOwnPropertySlot(ExecState* exec, const Identifie return getStaticValueSlot<JSWebKitAnimationEvent, Base>(exec, &JSWebKitAnimationEventTable, this, propertyName, slot); } -JSValuePtr jsWebKitAnimationEventAnimationName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWebKitAnimationEventAnimationName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WebKitAnimationEvent* imp = static_cast<WebKitAnimationEvent*>(static_cast<JSWebKitAnimationEvent*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->animationName()); } -JSValuePtr jsWebKitAnimationEventElapsedTime(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWebKitAnimationEventElapsedTime(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WebKitAnimationEvent* imp = static_cast<WebKitAnimationEvent*>(static_cast<JSWebKitAnimationEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->elapsedTime()); } -JSValuePtr jsWebKitAnimationEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWebKitAnimationEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSWebKitAnimationEvent*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSWebKitAnimationEvent::getConstructor(ExecState* exec) +JSValue JSWebKitAnimationEvent::getConstructor(ExecState* exec) { return getDOMConstructor<JSWebKitAnimationEventConstructor>(exec); } -JSValuePtr jsWebKitAnimationEventPrototypeFunctionInitWebKitAnimationEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsWebKitAnimationEventPrototypeFunctionInitWebKitAnimationEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSWebKitAnimationEvent::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWebKitAnimationEvent::s_info)) return throwError(exec, TypeError); JSWebKitAnimationEvent* castedThisObj = static_cast<JSWebKitAnimationEvent*>(asObject(thisValue)); WebKitAnimationEvent* imp = static_cast<WebKitAnimationEvent*>(castedThisObj->impl()); - const UString& typeArg = args.at(exec, 0)->toString(exec); - bool canBubbleArg = args.at(exec, 1)->toBoolean(exec); - bool cancelableArg = args.at(exec, 2)->toBoolean(exec); - const UString& animationNameArg = args.at(exec, 3)->toString(exec); - double elapsedTimeArg = args.at(exec, 4)->toNumber(exec); + const UString& typeArg = args.at(0).toString(exec); + bool canBubbleArg = args.at(1).toBoolean(exec); + bool cancelableArg = args.at(2).toBoolean(exec); + const UString& animationNameArg = args.at(3).toString(exec); + double elapsedTimeArg = args.at(4).toNumber(exec); imp->initWebKitAnimationEvent(typeArg, canBubbleArg, cancelableArg, animationNameArg, elapsedTimeArg); return jsUndefined(); diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitAnimationEvent.h b/src/3rdparty/webkit/WebCore/generated/JSWebKitAnimationEvent.h index d7a271b198..5c6862eb58 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitAnimationEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitAnimationEvent.h @@ -31,27 +31,28 @@ class JSWebKitAnimationEvent : public JSEvent { typedef JSEvent Base; public: JSWebKitAnimationEvent(PassRefPtr<JSC::Structure>, PassRefPtr<WebKitAnimationEvent>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSWebKitAnimationEventPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,12 +61,12 @@ public: // Functions -JSC::JSValuePtr jsWebKitAnimationEventPrototypeFunctionInitWebKitAnimationEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWebKitAnimationEventPrototypeFunctionInitWebKitAnimationEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsWebKitAnimationEventAnimationName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitAnimationEventElapsedTime(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitAnimationEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitAnimationEventAnimationName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitAnimationEventElapsedTime(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitAnimationEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframeRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframeRule.cpp index 9cccf8bf8d..6ba8f9a08c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframeRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframeRule.cpp @@ -37,7 +37,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSWebKitCSSKeyframeRule) +ASSERT_CLASS_FITS_IN_CELL(JSWebKitCSSKeyframeRule); /* Hash table */ @@ -75,13 +75,13 @@ public: JSWebKitCSSKeyframeRuleConstructor(ExecState* exec) : DOMObject(JSWebKitCSSKeyframeRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSWebKitCSSKeyframeRulePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSWebKitCSSKeyframeRulePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -110,9 +110,9 @@ static const HashTable JSWebKitCSSKeyframeRulePrototypeTable = const ClassInfo JSWebKitCSSKeyframeRulePrototype::s_info = { "WebKitCSSKeyframeRulePrototype", 0, &JSWebKitCSSKeyframeRulePrototypeTable, 0 }; -JSObject* JSWebKitCSSKeyframeRulePrototype::self(ExecState* exec) +JSObject* JSWebKitCSSKeyframeRulePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSWebKitCSSKeyframeRule>(exec); + return getDOMPrototype<JSWebKitCSSKeyframeRule>(exec, globalObject); } const ClassInfo JSWebKitCSSKeyframeRule::s_info = { "WebKitCSSKeyframeRule", &JSCSSRule::s_info, &JSWebKitCSSKeyframeRuleTable, 0 }; @@ -122,9 +122,9 @@ JSWebKitCSSKeyframeRule::JSWebKitCSSKeyframeRule(PassRefPtr<Structure> structure { } -JSObject* JSWebKitCSSKeyframeRule::createPrototype(ExecState* exec) +JSObject* JSWebKitCSSKeyframeRule::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSWebKitCSSKeyframeRulePrototype(JSWebKitCSSKeyframeRulePrototype::createStructure(JSCSSRulePrototype::self(exec))); + return new (exec) JSWebKitCSSKeyframeRulePrototype(JSWebKitCSSKeyframeRulePrototype::createStructure(JSCSSRulePrototype::self(exec, globalObject))); } bool JSWebKitCSSKeyframeRule::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -132,34 +132,36 @@ bool JSWebKitCSSKeyframeRule::getOwnPropertySlot(ExecState* exec, const Identifi return getStaticValueSlot<JSWebKitCSSKeyframeRule, Base>(exec, &JSWebKitCSSKeyframeRuleTable, this, propertyName, slot); } -JSValuePtr jsWebKitCSSKeyframeRuleKeyText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWebKitCSSKeyframeRuleKeyText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WebKitCSSKeyframeRule* imp = static_cast<WebKitCSSKeyframeRule*>(static_cast<JSWebKitCSSKeyframeRule*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->keyText()); } -JSValuePtr jsWebKitCSSKeyframeRuleStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWebKitCSSKeyframeRuleStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WebKitCSSKeyframeRule* imp = static_cast<WebKitCSSKeyframeRule*>(static_cast<JSWebKitCSSKeyframeRule*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->style())); } -JSValuePtr jsWebKitCSSKeyframeRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWebKitCSSKeyframeRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSWebKitCSSKeyframeRule*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSWebKitCSSKeyframeRule::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSWebKitCSSKeyframeRule::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSWebKitCSSKeyframeRule, Base>(exec, propertyName, value, &JSWebKitCSSKeyframeRuleTable, this, slot); } -void setJSWebKitCSSKeyframeRuleKeyText(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSWebKitCSSKeyframeRuleKeyText(ExecState* exec, JSObject* thisObject, JSValue value) { WebKitCSSKeyframeRule* imp = static_cast<WebKitCSSKeyframeRule*>(static_cast<JSWebKitCSSKeyframeRule*>(thisObject)->impl()); - imp->setKeyText(value->toString(exec)); + imp->setKeyText(value.toString(exec)); } -JSValuePtr JSWebKitCSSKeyframeRule::getConstructor(ExecState* exec) +JSValue JSWebKitCSSKeyframeRule::getConstructor(ExecState* exec) { return getDOMConstructor<JSWebKitCSSKeyframeRuleConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframeRule.h b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframeRule.h index 8a0d83c594..f77c22629b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframeRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframeRule.h @@ -31,24 +31,25 @@ class JSWebKitCSSKeyframeRule : public JSCSSRule { typedef JSCSSRule Base; public: JSWebKitCSSKeyframeRule(PassRefPtr<JSC::Structure>, PassRefPtr<WebKitCSSKeyframeRule>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSWebKitCSSKeyframeRulePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSWebKitCSSKeyframeRulePrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -56,10 +57,10 @@ public: // Attributes -JSC::JSValuePtr jsWebKitCSSKeyframeRuleKeyText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSWebKitCSSKeyframeRuleKeyText(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsWebKitCSSKeyframeRuleStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitCSSKeyframeRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSKeyframeRuleKeyText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSKeyframeRuleKeyText(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSKeyframeRuleStyle(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSKeyframeRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframesRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframesRule.cpp index 0bfcfa9243..50ef4229b3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframesRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframesRule.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSWebKitCSSKeyframesRule) +ASSERT_CLASS_FITS_IN_CELL(JSWebKitCSSKeyframesRule); /* Hash table */ @@ -77,13 +77,13 @@ public: JSWebKitCSSKeyframesRuleConstructor(ExecState* exec) : DOMObject(JSWebKitCSSKeyframesRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSWebKitCSSKeyframesRulePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSWebKitCSSKeyframesRulePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -115,9 +115,9 @@ static const HashTable JSWebKitCSSKeyframesRulePrototypeTable = const ClassInfo JSWebKitCSSKeyframesRulePrototype::s_info = { "WebKitCSSKeyframesRulePrototype", 0, &JSWebKitCSSKeyframesRulePrototypeTable, 0 }; -JSObject* JSWebKitCSSKeyframesRulePrototype::self(ExecState* exec) +JSObject* JSWebKitCSSKeyframesRulePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSWebKitCSSKeyframesRule>(exec); + return getDOMPrototype<JSWebKitCSSKeyframesRule>(exec, globalObject); } bool JSWebKitCSSKeyframesRulePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -132,9 +132,9 @@ JSWebKitCSSKeyframesRule::JSWebKitCSSKeyframesRule(PassRefPtr<Structure> structu { } -JSObject* JSWebKitCSSKeyframesRule::createPrototype(ExecState* exec) +JSObject* JSWebKitCSSKeyframesRule::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSWebKitCSSKeyframesRulePrototype(JSWebKitCSSKeyframesRulePrototype::createStructure(JSCSSRulePrototype::self(exec))); + return new (exec) JSWebKitCSSKeyframesRulePrototype(JSWebKitCSSKeyframesRulePrototype::createStructure(JSCSSRulePrototype::self(exec, globalObject))); } bool JSWebKitCSSKeyframesRule::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -162,28 +162,30 @@ bool JSWebKitCSSKeyframesRule::getOwnPropertySlot(ExecState* exec, unsigned prop return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot); } -JSValuePtr jsWebKitCSSKeyframesRuleName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWebKitCSSKeyframesRuleName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WebKitCSSKeyframesRule* imp = static_cast<WebKitCSSKeyframesRule*>(static_cast<JSWebKitCSSKeyframesRule*>(asObject(slot.slotBase()))->impl()); return jsStringOrNull(exec, imp->name()); } -JSValuePtr jsWebKitCSSKeyframesRuleCssRules(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWebKitCSSKeyframesRuleCssRules(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WebKitCSSKeyframesRule* imp = static_cast<WebKitCSSKeyframesRule*>(static_cast<JSWebKitCSSKeyframesRule*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->cssRules())); } -JSValuePtr jsWebKitCSSKeyframesRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWebKitCSSKeyframesRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSWebKitCSSKeyframesRule*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSWebKitCSSKeyframesRule::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSWebKitCSSKeyframesRule::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSWebKitCSSKeyframesRule, Base>(exec, propertyName, value, &JSWebKitCSSKeyframesRuleTable, this, slot); } -void setJSWebKitCSSKeyframesRuleName(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSWebKitCSSKeyframesRuleName(ExecState* exec, JSObject* thisObject, JSValue value) { WebKitCSSKeyframesRule* imp = static_cast<WebKitCSSKeyframesRule*>(static_cast<JSWebKitCSSKeyframesRule*>(thisObject)->impl()); imp->setName(valueToStringWithNullCheck(exec, value)); @@ -196,50 +198,53 @@ void JSWebKitCSSKeyframesRule::getPropertyNames(ExecState* exec, PropertyNameArr Base::getPropertyNames(exec, propertyNames); } -JSValuePtr JSWebKitCSSKeyframesRule::getConstructor(ExecState* exec) +JSValue JSWebKitCSSKeyframesRule::getConstructor(ExecState* exec) { return getDOMConstructor<JSWebKitCSSKeyframesRuleConstructor>(exec); } -JSValuePtr jsWebKitCSSKeyframesRulePrototypeFunctionInsertRule(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsWebKitCSSKeyframesRulePrototypeFunctionInsertRule(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSWebKitCSSKeyframesRule::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWebKitCSSKeyframesRule::s_info)) return throwError(exec, TypeError); JSWebKitCSSKeyframesRule* castedThisObj = static_cast<JSWebKitCSSKeyframesRule*>(asObject(thisValue)); WebKitCSSKeyframesRule* imp = static_cast<WebKitCSSKeyframesRule*>(castedThisObj->impl()); - const UString& rule = args.at(exec, 0)->toString(exec); + const UString& rule = args.at(0).toString(exec); imp->insertRule(rule); return jsUndefined(); } -JSValuePtr jsWebKitCSSKeyframesRulePrototypeFunctionDeleteRule(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsWebKitCSSKeyframesRulePrototypeFunctionDeleteRule(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSWebKitCSSKeyframesRule::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWebKitCSSKeyframesRule::s_info)) return throwError(exec, TypeError); JSWebKitCSSKeyframesRule* castedThisObj = static_cast<JSWebKitCSSKeyframesRule*>(asObject(thisValue)); WebKitCSSKeyframesRule* imp = static_cast<WebKitCSSKeyframesRule*>(castedThisObj->impl()); - const UString& key = args.at(exec, 0)->toString(exec); + const UString& key = args.at(0).toString(exec); imp->deleteRule(key); return jsUndefined(); } -JSValuePtr jsWebKitCSSKeyframesRulePrototypeFunctionFindRule(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsWebKitCSSKeyframesRulePrototypeFunctionFindRule(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSWebKitCSSKeyframesRule::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWebKitCSSKeyframesRule::s_info)) return throwError(exec, TypeError); JSWebKitCSSKeyframesRule* castedThisObj = static_cast<JSWebKitCSSKeyframesRule*>(asObject(thisValue)); WebKitCSSKeyframesRule* imp = static_cast<WebKitCSSKeyframesRule*>(castedThisObj->impl()); - const UString& key = args.at(exec, 0)->toString(exec); + const UString& key = args.at(0).toString(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->findRule(key))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->findRule(key))); return result; } -JSValuePtr JSWebKitCSSKeyframesRule::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValue JSWebKitCSSKeyframesRule::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSWebKitCSSKeyframesRule* thisObj = static_cast<JSWebKitCSSKeyframesRule*>(asObject(slot.slotBase())); return toJS(exec, static_cast<WebKitCSSKeyframesRule*>(thisObj->impl())->item(slot.index())); diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframesRule.h b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframesRule.h index b689e1209d..789f0a1499 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframesRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframesRule.h @@ -31,31 +31,32 @@ class JSWebKitCSSKeyframesRule : public JSCSSRule { typedef JSCSSRule Base; public: JSWebKitCSSKeyframesRule(PassRefPtr<JSC::Structure>, PassRefPtr<WebKitCSSKeyframesRule>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); - static JSC::JSValuePtr indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; class JSWebKitCSSKeyframesRulePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -64,15 +65,15 @@ public: // Functions -JSC::JSValuePtr jsWebKitCSSKeyframesRulePrototypeFunctionInsertRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsWebKitCSSKeyframesRulePrototypeFunctionDeleteRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsWebKitCSSKeyframesRulePrototypeFunctionFindRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWebKitCSSKeyframesRulePrototypeFunctionInsertRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWebKitCSSKeyframesRulePrototypeFunctionDeleteRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWebKitCSSKeyframesRulePrototypeFunctionFindRule(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsWebKitCSSKeyframesRuleName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSWebKitCSSKeyframesRuleName(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsWebKitCSSKeyframesRuleCssRules(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitCSSKeyframesRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSKeyframesRuleName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSKeyframesRuleName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSKeyframesRuleCssRules(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSKeyframesRuleConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSMatrix.cpp b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSMatrix.cpp new file mode 100644 index 0000000000..a9479de7c6 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSMatrix.cpp @@ -0,0 +1,556 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "config.h" + +#include "JSWebKitCSSMatrix.h" + +#include <wtf/GetPtr.h> + +#include "JSWebKitCSSMatrix.h" +#include "KURL.h" +#include "WebKitCSSMatrix.h" + +#include <runtime/Error.h> +#include <runtime/JSNumberCell.h> +#include <runtime/JSString.h> + +using namespace JSC; + +namespace WebCore { + +ASSERT_CLASS_FITS_IN_CELL(JSWebKitCSSMatrix); + +/* Hash table */ + +static const HashTableValue JSWebKitCSSMatrixTableValues[23] = +{ + { "a", DontDelete, (intptr_t)jsWebKitCSSMatrixA, (intptr_t)setJSWebKitCSSMatrixA }, + { "b", DontDelete, (intptr_t)jsWebKitCSSMatrixB, (intptr_t)setJSWebKitCSSMatrixB }, + { "c", DontDelete, (intptr_t)jsWebKitCSSMatrixC, (intptr_t)setJSWebKitCSSMatrixC }, + { "d", DontDelete, (intptr_t)jsWebKitCSSMatrixD, (intptr_t)setJSWebKitCSSMatrixD }, + { "e", DontDelete, (intptr_t)jsWebKitCSSMatrixE, (intptr_t)setJSWebKitCSSMatrixE }, + { "f", DontDelete, (intptr_t)jsWebKitCSSMatrixF, (intptr_t)setJSWebKitCSSMatrixF }, + { "m11", DontDelete, (intptr_t)jsWebKitCSSMatrixM11, (intptr_t)setJSWebKitCSSMatrixM11 }, + { "m12", DontDelete, (intptr_t)jsWebKitCSSMatrixM12, (intptr_t)setJSWebKitCSSMatrixM12 }, + { "m13", DontDelete, (intptr_t)jsWebKitCSSMatrixM13, (intptr_t)setJSWebKitCSSMatrixM13 }, + { "m14", DontDelete, (intptr_t)jsWebKitCSSMatrixM14, (intptr_t)setJSWebKitCSSMatrixM14 }, + { "m21", DontDelete, (intptr_t)jsWebKitCSSMatrixM21, (intptr_t)setJSWebKitCSSMatrixM21 }, + { "m22", DontDelete, (intptr_t)jsWebKitCSSMatrixM22, (intptr_t)setJSWebKitCSSMatrixM22 }, + { "m23", DontDelete, (intptr_t)jsWebKitCSSMatrixM23, (intptr_t)setJSWebKitCSSMatrixM23 }, + { "m24", DontDelete, (intptr_t)jsWebKitCSSMatrixM24, (intptr_t)setJSWebKitCSSMatrixM24 }, + { "m31", DontDelete, (intptr_t)jsWebKitCSSMatrixM31, (intptr_t)setJSWebKitCSSMatrixM31 }, + { "m32", DontDelete, (intptr_t)jsWebKitCSSMatrixM32, (intptr_t)setJSWebKitCSSMatrixM32 }, + { "m33", DontDelete, (intptr_t)jsWebKitCSSMatrixM33, (intptr_t)setJSWebKitCSSMatrixM33 }, + { "m34", DontDelete, (intptr_t)jsWebKitCSSMatrixM34, (intptr_t)setJSWebKitCSSMatrixM34 }, + { "m41", DontDelete, (intptr_t)jsWebKitCSSMatrixM41, (intptr_t)setJSWebKitCSSMatrixM41 }, + { "m42", DontDelete, (intptr_t)jsWebKitCSSMatrixM42, (intptr_t)setJSWebKitCSSMatrixM42 }, + { "m43", DontDelete, (intptr_t)jsWebKitCSSMatrixM43, (intptr_t)setJSWebKitCSSMatrixM43 }, + { "m44", DontDelete, (intptr_t)jsWebKitCSSMatrixM44, (intptr_t)setJSWebKitCSSMatrixM44 }, + { 0, 0, 0, 0 } +}; + +static const HashTable JSWebKitCSSMatrixTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 255, JSWebKitCSSMatrixTableValues, 0 }; +#else + { 65, 63, JSWebKitCSSMatrixTableValues, 0 }; +#endif + +/* Hash table for prototype */ + +static const HashTableValue JSWebKitCSSMatrixPrototypeTableValues[9] = +{ + { "setMatrixValue", DontDelete|Function, (intptr_t)jsWebKitCSSMatrixPrototypeFunctionSetMatrixValue, (intptr_t)1 }, + { "multiply", DontDelete|Function, (intptr_t)jsWebKitCSSMatrixPrototypeFunctionMultiply, (intptr_t)1 }, + { "inverse", DontDelete|Function, (intptr_t)jsWebKitCSSMatrixPrototypeFunctionInverse, (intptr_t)0 }, + { "translate", DontDelete|Function, (intptr_t)jsWebKitCSSMatrixPrototypeFunctionTranslate, (intptr_t)3 }, + { "scale", DontDelete|Function, (intptr_t)jsWebKitCSSMatrixPrototypeFunctionScale, (intptr_t)3 }, + { "rotate", DontDelete|Function, (intptr_t)jsWebKitCSSMatrixPrototypeFunctionRotate, (intptr_t)3 }, + { "rotateAxisAngle", DontDelete|Function, (intptr_t)jsWebKitCSSMatrixPrototypeFunctionRotateAxisAngle, (intptr_t)4 }, + { "toString", DontDelete|DontEnum|Function, (intptr_t)jsWebKitCSSMatrixPrototypeFunctionToString, (intptr_t)0 }, + { 0, 0, 0, 0 } +}; + +static const HashTable JSWebKitCSSMatrixPrototypeTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 63, JSWebKitCSSMatrixPrototypeTableValues, 0 }; +#else + { 17, 15, JSWebKitCSSMatrixPrototypeTableValues, 0 }; +#endif + +const ClassInfo JSWebKitCSSMatrixPrototype::s_info = { "WebKitCSSMatrixPrototype", 0, &JSWebKitCSSMatrixPrototypeTable, 0 }; + +JSObject* JSWebKitCSSMatrixPrototype::self(ExecState* exec, JSGlobalObject* globalObject) +{ + return getDOMPrototype<JSWebKitCSSMatrix>(exec, globalObject); +} + +bool JSWebKitCSSMatrixPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticFunctionSlot<JSObject>(exec, &JSWebKitCSSMatrixPrototypeTable, this, propertyName, slot); +} + +const ClassInfo JSWebKitCSSMatrix::s_info = { "WebKitCSSMatrix", 0, &JSWebKitCSSMatrixTable, 0 }; + +JSWebKitCSSMatrix::JSWebKitCSSMatrix(PassRefPtr<Structure> structure, PassRefPtr<WebKitCSSMatrix> impl) + : DOMObject(structure) + , m_impl(impl) +{ +} + +JSWebKitCSSMatrix::~JSWebKitCSSMatrix() +{ + forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); +} + +JSObject* JSWebKitCSSMatrix::createPrototype(ExecState* exec, JSGlobalObject* globalObject) +{ + return new (exec) JSWebKitCSSMatrixPrototype(JSWebKitCSSMatrixPrototype::createStructure(globalObject->objectPrototype())); +} + +bool JSWebKitCSSMatrix::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot<JSWebKitCSSMatrix, Base>(exec, &JSWebKitCSSMatrixTable, this, propertyName, slot); +} + +JSValue jsWebKitCSSMatrixA(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->a()); +} + +JSValue jsWebKitCSSMatrixB(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->b()); +} + +JSValue jsWebKitCSSMatrixC(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->c()); +} + +JSValue jsWebKitCSSMatrixD(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->d()); +} + +JSValue jsWebKitCSSMatrixE(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->e()); +} + +JSValue jsWebKitCSSMatrixF(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->f()); +} + +JSValue jsWebKitCSSMatrixM11(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->m11()); +} + +JSValue jsWebKitCSSMatrixM12(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->m12()); +} + +JSValue jsWebKitCSSMatrixM13(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->m13()); +} + +JSValue jsWebKitCSSMatrixM14(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->m14()); +} + +JSValue jsWebKitCSSMatrixM21(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->m21()); +} + +JSValue jsWebKitCSSMatrixM22(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->m22()); +} + +JSValue jsWebKitCSSMatrixM23(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->m23()); +} + +JSValue jsWebKitCSSMatrixM24(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->m24()); +} + +JSValue jsWebKitCSSMatrixM31(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->m31()); +} + +JSValue jsWebKitCSSMatrixM32(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->m32()); +} + +JSValue jsWebKitCSSMatrixM33(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->m33()); +} + +JSValue jsWebKitCSSMatrixM34(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->m34()); +} + +JSValue jsWebKitCSSMatrixM41(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->m41()); +} + +JSValue jsWebKitCSSMatrixM42(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->m42()); +} + +JSValue jsWebKitCSSMatrixM43(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->m43()); +} + +JSValue jsWebKitCSSMatrixM44(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->m44()); +} + +void JSWebKitCSSMatrix::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) +{ + lookupPut<JSWebKitCSSMatrix, Base>(exec, propertyName, value, &JSWebKitCSSMatrixTable, this, slot); +} + +void setJSWebKitCSSMatrixA(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setA(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixB(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setB(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixC(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setC(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixD(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setD(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixE(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setE(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixF(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setF(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixM11(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setM11(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixM12(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setM12(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixM13(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setM13(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixM14(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setM14(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixM21(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setM21(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixM22(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setM22(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixM23(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setM23(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixM24(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setM24(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixM31(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setM31(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixM32(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setM32(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixM33(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setM33(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixM34(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setM34(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixM41(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setM41(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixM42(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setM42(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixM43(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setM43(value.toNumber(exec)); +} + +void setJSWebKitCSSMatrixM44(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(static_cast<JSWebKitCSSMatrix*>(thisObject)->impl()); + imp->setM44(value.toNumber(exec)); +} + +JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionSetMatrixValue(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWebKitCSSMatrix::s_info)) + return throwError(exec, TypeError); + JSWebKitCSSMatrix* castedThisObj = static_cast<JSWebKitCSSMatrix*>(asObject(thisValue)); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(castedThisObj->impl()); + ExceptionCode ec = 0; + const UString& string = args.at(0).toString(exec); + + imp->setMatrixValue(string, ec); + setDOMException(exec, ec); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionMultiply(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWebKitCSSMatrix::s_info)) + return throwError(exec, TypeError); + JSWebKitCSSMatrix* castedThisObj = static_cast<JSWebKitCSSMatrix*>(asObject(thisValue)); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(castedThisObj->impl()); + WebKitCSSMatrix* secondMatrix = toWebKitCSSMatrix(args.at(0)); + + + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->multiply(secondMatrix))); + return result; +} + +JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionInverse(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWebKitCSSMatrix::s_info)) + return throwError(exec, TypeError); + JSWebKitCSSMatrix* castedThisObj = static_cast<JSWebKitCSSMatrix*>(asObject(thisValue)); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(castedThisObj->impl()); + ExceptionCode ec = 0; + + + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->inverse(ec))); + setDOMException(exec, ec); + return result; +} + +JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionTranslate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWebKitCSSMatrix::s_info)) + return throwError(exec, TypeError); + JSWebKitCSSMatrix* castedThisObj = static_cast<JSWebKitCSSMatrix*>(asObject(thisValue)); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(castedThisObj->impl()); + double x = args.at(0).toNumber(exec); + double y = args.at(1).toNumber(exec); + double z = args.at(2).toNumber(exec); + + + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->translate(x, y, z))); + return result; +} + +JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionScale(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWebKitCSSMatrix::s_info)) + return throwError(exec, TypeError); + JSWebKitCSSMatrix* castedThisObj = static_cast<JSWebKitCSSMatrix*>(asObject(thisValue)); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(castedThisObj->impl()); + double scaleX = args.at(0).toNumber(exec); + double scaleY = args.at(1).toNumber(exec); + double scaleZ = args.at(2).toNumber(exec); + + + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->scale(scaleX, scaleY, scaleZ))); + return result; +} + +JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionRotate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWebKitCSSMatrix::s_info)) + return throwError(exec, TypeError); + JSWebKitCSSMatrix* castedThisObj = static_cast<JSWebKitCSSMatrix*>(asObject(thisValue)); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(castedThisObj->impl()); + double rotX = args.at(0).toNumber(exec); + double rotY = args.at(1).toNumber(exec); + double rotZ = args.at(2).toNumber(exec); + + + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->rotate(rotX, rotY, rotZ))); + return result; +} + +JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionRotateAxisAngle(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWebKitCSSMatrix::s_info)) + return throwError(exec, TypeError); + JSWebKitCSSMatrix* castedThisObj = static_cast<JSWebKitCSSMatrix*>(asObject(thisValue)); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(castedThisObj->impl()); + double x = args.at(0).toNumber(exec); + double y = args.at(1).toNumber(exec); + double z = args.at(2).toNumber(exec); + double angle = args.at(3).toNumber(exec); + + + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->rotateAxisAngle(x, y, z, angle))); + return result; +} + +JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWebKitCSSMatrix::s_info)) + return throwError(exec, TypeError); + JSWebKitCSSMatrix* castedThisObj = static_cast<JSWebKitCSSMatrix*>(asObject(thisValue)); + WebKitCSSMatrix* imp = static_cast<WebKitCSSMatrix*>(castedThisObj->impl()); + + + JSC::JSValue result = jsString(exec, imp->toString()); + return result; +} + +JSC::JSValue toJS(JSC::ExecState* exec, WebKitCSSMatrix* object) +{ + return getDOMObjectWrapper<JSWebKitCSSMatrix>(exec, object); +} +WebKitCSSMatrix* toWebKitCSSMatrix(JSC::JSValue value) +{ + return value.isObject(&JSWebKitCSSMatrix::s_info) ? static_cast<JSWebKitCSSMatrix*>(asObject(value))->impl() : 0; +} + +} diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSMatrix.h b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSMatrix.h new file mode 100644 index 0000000000..ad377126d1 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSMatrix.h @@ -0,0 +1,130 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef JSWebKitCSSMatrix_h +#define JSWebKitCSSMatrix_h + +#include "JSDOMBinding.h" +#include <runtime/JSGlobalObject.h> +#include <runtime/ObjectPrototype.h> + +namespace WebCore { + +class WebKitCSSMatrix; + +class JSWebKitCSSMatrix : public DOMObject { + typedef DOMObject Base; +public: + JSWebKitCSSMatrix(PassRefPtr<JSC::Structure>, PassRefPtr<WebKitCSSMatrix>); + virtual ~JSWebKitCSSMatrix(); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + + WebKitCSSMatrix* impl() const { return m_impl.get(); } + +private: + RefPtr<WebKitCSSMatrix> m_impl; +}; + +JSC::JSValue toJS(JSC::ExecState*, WebKitCSSMatrix*); +WebKitCSSMatrix* toWebKitCSSMatrix(JSC::JSValue); + +class JSWebKitCSSMatrixPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; +public: + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + JSWebKitCSSMatrixPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } +}; + +// Functions + +JSC::JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionSetMatrixValue(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionMultiply(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionInverse(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionTranslate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionScale(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionRotate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionRotateAxisAngle(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +// Attributes + +JSC::JSValue jsWebKitCSSMatrixA(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixA(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixB(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixB(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixC(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixC(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixD(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixD(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixE(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixF(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixF(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixM11(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixM11(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixM12(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixM12(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixM13(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixM13(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixM14(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixM14(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixM21(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixM21(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixM22(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixM22(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixM23(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixM23(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixM24(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixM24(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixM31(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixM31(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixM32(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixM32(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixM33(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixM33(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixM34(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixM34(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixM41(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixM41(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixM42(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixM42(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixM43(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixM43(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitCSSMatrixM44(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitCSSMatrixM44(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); + +} // namespace WebCore + +#endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSTransformValue.cpp b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSTransformValue.cpp index d0b1072d34..07ed92cb7a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSTransformValue.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSTransformValue.cpp @@ -32,7 +32,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSWebKitCSSTransformValue) +ASSERT_CLASS_FITS_IN_CELL(JSWebKitCSSTransformValue); /* Hash table */ @@ -52,7 +52,7 @@ static const HashTable JSWebKitCSSTransformValueTable = /* Hash table for constructor */ -static const HashTableValue JSWebKitCSSTransformValueConstructorTableValues[12] = +static const HashTableValue JSWebKitCSSTransformValueConstructorTableValues[22] = { { "CSS_TRANSLATE", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_TRANSLATE, (intptr_t)0 }, { "CSS_TRANSLATEX", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_TRANSLATEX, (intptr_t)0 }, @@ -65,6 +65,16 @@ static const HashTableValue JSWebKitCSSTransformValueConstructorTableValues[12] { "CSS_SKEWX", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_SKEWX, (intptr_t)0 }, { "CSS_SKEWY", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_SKEWY, (intptr_t)0 }, { "CSS_MATRIX", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_MATRIX, (intptr_t)0 }, + { "CSS_TRANSLATEZ", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_TRANSLATEZ, (intptr_t)0 }, + { "CSS_TRANSLATE3D", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_TRANSLATE3D, (intptr_t)0 }, + { "CSS_ROTATEX", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_ROTATEX, (intptr_t)0 }, + { "CSS_ROTATEY", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_ROTATEY, (intptr_t)0 }, + { "CSS_ROTATEZ", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_ROTATEZ, (intptr_t)0 }, + { "CSS_ROTATE3D", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_ROTATE3D, (intptr_t)0 }, + { "CSS_SCALEZ", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_SCALEZ, (intptr_t)0 }, + { "CSS_SCALE3D", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_SCALE3D, (intptr_t)0 }, + { "CSS_PERSPECTIVE", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_PERSPECTIVE, (intptr_t)0 }, + { "CSS_MATRIX3D", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_MATRIX3D, (intptr_t)0 }, { 0, 0, 0, 0 } }; @@ -72,7 +82,7 @@ static const HashTable JSWebKitCSSTransformValueConstructorTable = #if ENABLE(PERFECT_HASH_SIZE) { 1023, JSWebKitCSSTransformValueConstructorTableValues, 0 }; #else - { 33, 31, JSWebKitCSSTransformValueConstructorTableValues, 0 }; + { 68, 63, JSWebKitCSSTransformValueConstructorTableValues, 0 }; #endif class JSWebKitCSSTransformValueConstructor : public DOMObject { @@ -80,13 +90,13 @@ public: JSWebKitCSSTransformValueConstructor(ExecState* exec) : DOMObject(JSWebKitCSSTransformValueConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSWebKitCSSTransformValuePrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSWebKitCSSTransformValuePrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -101,7 +111,7 @@ bool JSWebKitCSSTransformValueConstructor::getOwnPropertySlot(ExecState* exec, c /* Hash table for prototype */ -static const HashTableValue JSWebKitCSSTransformValuePrototypeTableValues[12] = +static const HashTableValue JSWebKitCSSTransformValuePrototypeTableValues[22] = { { "CSS_TRANSLATE", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_TRANSLATE, (intptr_t)0 }, { "CSS_TRANSLATEX", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_TRANSLATEX, (intptr_t)0 }, @@ -114,6 +124,16 @@ static const HashTableValue JSWebKitCSSTransformValuePrototypeTableValues[12] = { "CSS_SKEWX", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_SKEWX, (intptr_t)0 }, { "CSS_SKEWY", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_SKEWY, (intptr_t)0 }, { "CSS_MATRIX", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_MATRIX, (intptr_t)0 }, + { "CSS_TRANSLATEZ", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_TRANSLATEZ, (intptr_t)0 }, + { "CSS_TRANSLATE3D", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_TRANSLATE3D, (intptr_t)0 }, + { "CSS_ROTATEX", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_ROTATEX, (intptr_t)0 }, + { "CSS_ROTATEY", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_ROTATEY, (intptr_t)0 }, + { "CSS_ROTATEZ", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_ROTATEZ, (intptr_t)0 }, + { "CSS_ROTATE3D", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_ROTATE3D, (intptr_t)0 }, + { "CSS_SCALEZ", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_SCALEZ, (intptr_t)0 }, + { "CSS_SCALE3D", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_SCALE3D, (intptr_t)0 }, + { "CSS_PERSPECTIVE", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_PERSPECTIVE, (intptr_t)0 }, + { "CSS_MATRIX3D", DontDelete|ReadOnly, (intptr_t)jsWebKitCSSTransformValueCSS_MATRIX3D, (intptr_t)0 }, { 0, 0, 0, 0 } }; @@ -121,14 +141,14 @@ static const HashTable JSWebKitCSSTransformValuePrototypeTable = #if ENABLE(PERFECT_HASH_SIZE) { 1023, JSWebKitCSSTransformValuePrototypeTableValues, 0 }; #else - { 33, 31, JSWebKitCSSTransformValuePrototypeTableValues, 0 }; + { 68, 63, JSWebKitCSSTransformValuePrototypeTableValues, 0 }; #endif const ClassInfo JSWebKitCSSTransformValuePrototype::s_info = { "WebKitCSSTransformValuePrototype", 0, &JSWebKitCSSTransformValuePrototypeTable, 0 }; -JSObject* JSWebKitCSSTransformValuePrototype::self(ExecState* exec) +JSObject* JSWebKitCSSTransformValuePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSWebKitCSSTransformValue>(exec); + return getDOMPrototype<JSWebKitCSSTransformValue>(exec, globalObject); } bool JSWebKitCSSTransformValuePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -143,9 +163,9 @@ JSWebKitCSSTransformValue::JSWebKitCSSTransformValue(PassRefPtr<Structure> struc { } -JSObject* JSWebKitCSSTransformValue::createPrototype(ExecState* exec) +JSObject* JSWebKitCSSTransformValue::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSWebKitCSSTransformValuePrototype(JSWebKitCSSTransformValuePrototype::createStructure(JSCSSValueListPrototype::self(exec))); + return new (exec) JSWebKitCSSTransformValuePrototype(JSWebKitCSSTransformValuePrototype::createStructure(JSCSSValueListPrototype::self(exec, globalObject))); } bool JSWebKitCSSTransformValue::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -153,77 +173,128 @@ bool JSWebKitCSSTransformValue::getOwnPropertySlot(ExecState* exec, const Identi return getStaticValueSlot<JSWebKitCSSTransformValue, Base>(exec, &JSWebKitCSSTransformValueTable, this, propertyName, slot); } -JSValuePtr jsWebKitCSSTransformValueOperationType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWebKitCSSTransformValueOperationType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WebKitCSSTransformValue* imp = static_cast<WebKitCSSTransformValue*>(static_cast<JSWebKitCSSTransformValue*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->operationType()); } -JSValuePtr jsWebKitCSSTransformValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWebKitCSSTransformValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSWebKitCSSTransformValue*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSWebKitCSSTransformValue::getConstructor(ExecState* exec) +JSValue JSWebKitCSSTransformValue::getConstructor(ExecState* exec) { return getDOMConstructor<JSWebKitCSSTransformValueConstructor>(exec); } // Constant getters -JSValuePtr jsWebKitCSSTransformValueCSS_TRANSLATE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsWebKitCSSTransformValueCSS_TRANSLATE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsWebKitCSSTransformValueCSS_TRANSLATEX(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsWebKitCSSTransformValueCSS_TRANSLATEX(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsWebKitCSSTransformValueCSS_TRANSLATEY(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsWebKitCSSTransformValueCSS_TRANSLATEY(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsWebKitCSSTransformValueCSS_ROTATE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsWebKitCSSTransformValueCSS_ROTATE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSValuePtr jsWebKitCSSTransformValueCSS_SCALE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsWebKitCSSTransformValueCSS_SCALE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(5)); } -JSValuePtr jsWebKitCSSTransformValueCSS_SCALEX(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsWebKitCSSTransformValueCSS_SCALEX(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(6)); } -JSValuePtr jsWebKitCSSTransformValueCSS_SCALEY(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsWebKitCSSTransformValueCSS_SCALEY(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(7)); } -JSValuePtr jsWebKitCSSTransformValueCSS_SKEW(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsWebKitCSSTransformValueCSS_SKEW(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(8)); } -JSValuePtr jsWebKitCSSTransformValueCSS_SKEWX(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsWebKitCSSTransformValueCSS_SKEWX(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(9)); } -JSValuePtr jsWebKitCSSTransformValueCSS_SKEWY(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsWebKitCSSTransformValueCSS_SKEWY(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(10)); } -JSValuePtr jsWebKitCSSTransformValueCSS_MATRIX(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsWebKitCSSTransformValueCSS_MATRIX(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(11)); } +JSValue jsWebKitCSSTransformValueCSS_TRANSLATEZ(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(12)); +} + +JSValue jsWebKitCSSTransformValueCSS_TRANSLATE3D(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(13)); +} + +JSValue jsWebKitCSSTransformValueCSS_ROTATEX(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(14)); +} + +JSValue jsWebKitCSSTransformValueCSS_ROTATEY(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(15)); +} + +JSValue jsWebKitCSSTransformValueCSS_ROTATEZ(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(16)); +} + +JSValue jsWebKitCSSTransformValueCSS_ROTATE3D(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(17)); +} + +JSValue jsWebKitCSSTransformValueCSS_SCALEZ(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(18)); +} + +JSValue jsWebKitCSSTransformValueCSS_SCALE3D(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(19)); +} + +JSValue jsWebKitCSSTransformValueCSS_PERSPECTIVE(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(20)); +} + +JSValue jsWebKitCSSTransformValueCSS_MATRIX3D(ExecState* exec, const Identifier&, const PropertySlot&) +{ + return jsNumber(exec, static_cast<int>(21)); +} + } diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSTransformValue.h b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSTransformValue.h index d5d8915062..3f636e3f29 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSTransformValue.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSTransformValue.h @@ -31,27 +31,28 @@ class JSWebKitCSSTransformValue : public JSCSSValueList { typedef JSCSSValueList Base; public: JSWebKitCSSTransformValue(PassRefPtr<JSC::Structure>, PassRefPtr<WebKitCSSTransformValue>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSWebKitCSSTransformValuePrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,21 +61,31 @@ public: // Attributes -JSC::JSValuePtr jsWebKitCSSTransformValueOperationType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitCSSTransformValueConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueOperationType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsWebKitCSSTransformValueCSS_TRANSLATE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitCSSTransformValueCSS_TRANSLATEX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitCSSTransformValueCSS_TRANSLATEY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitCSSTransformValueCSS_ROTATE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitCSSTransformValueCSS_SCALE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitCSSTransformValueCSS_SCALEX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitCSSTransformValueCSS_SCALEY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitCSSTransformValueCSS_SKEW(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitCSSTransformValueCSS_SKEWX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitCSSTransformValueCSS_SKEWY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitCSSTransformValueCSS_MATRIX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_TRANSLATE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_TRANSLATEX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_TRANSLATEY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_ROTATE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_SCALE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_SCALEX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_SCALEY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_SKEW(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_SKEWX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_SKEWY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_MATRIX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_TRANSLATEZ(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_TRANSLATE3D(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_ROTATEX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_ROTATEY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_ROTATEZ(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_ROTATE3D(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_SCALEZ(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_SCALE3D(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_PERSPECTIVE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitCSSTransformValueCSS_MATRIX3D(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitPoint.cpp b/src/3rdparty/webkit/WebCore/generated/JSWebKitPoint.cpp new file mode 100644 index 0000000000..4c433d4e6a --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitPoint.cpp @@ -0,0 +1,137 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "config.h" + +#include "JSWebKitPoint.h" + +#include <wtf/GetPtr.h> + +#include "WebKitPoint.h" + +#include <runtime/JSNumberCell.h> + +using namespace JSC; + +namespace WebCore { + +ASSERT_CLASS_FITS_IN_CELL(JSWebKitPoint); + +/* Hash table */ + +static const HashTableValue JSWebKitPointTableValues[3] = +{ + { "x", DontDelete, (intptr_t)jsWebKitPointX, (intptr_t)setJSWebKitPointX }, + { "y", DontDelete, (intptr_t)jsWebKitPointY, (intptr_t)setJSWebKitPointY }, + { 0, 0, 0, 0 } +}; + +static const HashTable JSWebKitPointTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 1, JSWebKitPointTableValues, 0 }; +#else + { 4, 3, JSWebKitPointTableValues, 0 }; +#endif + +/* Hash table for prototype */ + +static const HashTableValue JSWebKitPointPrototypeTableValues[1] = +{ + { 0, 0, 0, 0 } +}; + +static const HashTable JSWebKitPointPrototypeTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSWebKitPointPrototypeTableValues, 0 }; +#else + { 1, 0, JSWebKitPointPrototypeTableValues, 0 }; +#endif + +const ClassInfo JSWebKitPointPrototype::s_info = { "WebKitPointPrototype", 0, &JSWebKitPointPrototypeTable, 0 }; + +JSObject* JSWebKitPointPrototype::self(ExecState* exec, JSGlobalObject* globalObject) +{ + return getDOMPrototype<JSWebKitPoint>(exec, globalObject); +} + +const ClassInfo JSWebKitPoint::s_info = { "WebKitPoint", 0, &JSWebKitPointTable, 0 }; + +JSWebKitPoint::JSWebKitPoint(PassRefPtr<Structure> structure, PassRefPtr<WebKitPoint> impl) + : DOMObject(structure) + , m_impl(impl) +{ +} + +JSWebKitPoint::~JSWebKitPoint() +{ + forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); +} + +JSObject* JSWebKitPoint::createPrototype(ExecState* exec, JSGlobalObject* globalObject) +{ + return new (exec) JSWebKitPointPrototype(JSWebKitPointPrototype::createStructure(globalObject->objectPrototype())); +} + +bool JSWebKitPoint::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot<JSWebKitPoint, Base>(exec, &JSWebKitPointTable, this, propertyName, slot); +} + +JSValue jsWebKitPointX(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitPoint* imp = static_cast<WebKitPoint*>(static_cast<JSWebKitPoint*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->x()); +} + +JSValue jsWebKitPointY(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); + WebKitPoint* imp = static_cast<WebKitPoint*>(static_cast<JSWebKitPoint*>(asObject(slot.slotBase()))->impl()); + return jsNumber(exec, imp->y()); +} + +void JSWebKitPoint::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) +{ + lookupPut<JSWebKitPoint, Base>(exec, propertyName, value, &JSWebKitPointTable, this, slot); +} + +void setJSWebKitPointX(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitPoint* imp = static_cast<WebKitPoint*>(static_cast<JSWebKitPoint*>(thisObject)->impl()); + imp->setX(value.toFloat(exec)); +} + +void setJSWebKitPointY(ExecState* exec, JSObject* thisObject, JSValue value) +{ + WebKitPoint* imp = static_cast<WebKitPoint*>(static_cast<JSWebKitPoint*>(thisObject)->impl()); + imp->setY(value.toFloat(exec)); +} + +JSC::JSValue toJS(JSC::ExecState* exec, WebKitPoint* object) +{ + return getDOMObjectWrapper<JSWebKitPoint>(exec, object); +} +WebKitPoint* toWebKitPoint(JSC::JSValue value) +{ + return value.isObject(&JSWebKitPoint::s_info) ? static_cast<JSWebKitPoint*>(asObject(value))->impl() : 0; +} + +} diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitPoint.h b/src/3rdparty/webkit/WebCore/generated/JSWebKitPoint.h new file mode 100644 index 0000000000..1a7c88f011 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitPoint.h @@ -0,0 +1,75 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef JSWebKitPoint_h +#define JSWebKitPoint_h + +#include "JSDOMBinding.h" +#include <runtime/JSGlobalObject.h> +#include <runtime/ObjectPrototype.h> + +namespace WebCore { + +class WebKitPoint; + +class JSWebKitPoint : public DOMObject { + typedef DOMObject Base; +public: + JSWebKitPoint(PassRefPtr<JSC::Structure>, PassRefPtr<WebKitPoint>); + virtual ~JSWebKitPoint(); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + + WebKitPoint* impl() const { return m_impl.get(); } + +private: + RefPtr<WebKitPoint> m_impl; +}; + +JSC::JSValue toJS(JSC::ExecState*, WebKitPoint*); +WebKitPoint* toWebKitPoint(JSC::JSValue); + +class JSWebKitPointPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; +public: + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + JSWebKitPointPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } +}; + +// Attributes + +JSC::JSValue jsWebKitPointX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitPointX(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWebKitPointY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWebKitPointY(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); + +} // namespace WebCore + +#endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitTransitionEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSWebKitTransitionEvent.cpp index 2090734132..d254d28af2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitTransitionEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitTransitionEvent.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSWebKitTransitionEvent) +ASSERT_CLASS_FITS_IN_CELL(JSWebKitTransitionEvent); /* Hash table */ @@ -73,13 +73,13 @@ public: JSWebKitTransitionEventConstructor(ExecState* exec) : DOMObject(JSWebKitTransitionEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSWebKitTransitionEventPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSWebKitTransitionEventPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -109,9 +109,9 @@ static const HashTable JSWebKitTransitionEventPrototypeTable = const ClassInfo JSWebKitTransitionEventPrototype::s_info = { "WebKitTransitionEventPrototype", 0, &JSWebKitTransitionEventPrototypeTable, 0 }; -JSObject* JSWebKitTransitionEventPrototype::self(ExecState* exec) +JSObject* JSWebKitTransitionEventPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSWebKitTransitionEvent>(exec); + return getDOMPrototype<JSWebKitTransitionEvent>(exec, globalObject); } bool JSWebKitTransitionEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -126,9 +126,9 @@ JSWebKitTransitionEvent::JSWebKitTransitionEvent(PassRefPtr<Structure> structure { } -JSObject* JSWebKitTransitionEvent::createPrototype(ExecState* exec) +JSObject* JSWebKitTransitionEvent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSWebKitTransitionEventPrototype(JSWebKitTransitionEventPrototype::createStructure(JSEventPrototype::self(exec))); + return new (exec) JSWebKitTransitionEventPrototype(JSWebKitTransitionEventPrototype::createStructure(JSEventPrototype::self(exec, globalObject))); } bool JSWebKitTransitionEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -136,38 +136,41 @@ bool JSWebKitTransitionEvent::getOwnPropertySlot(ExecState* exec, const Identifi return getStaticValueSlot<JSWebKitTransitionEvent, Base>(exec, &JSWebKitTransitionEventTable, this, propertyName, slot); } -JSValuePtr jsWebKitTransitionEventPropertyName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWebKitTransitionEventPropertyName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WebKitTransitionEvent* imp = static_cast<WebKitTransitionEvent*>(static_cast<JSWebKitTransitionEvent*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->propertyName()); } -JSValuePtr jsWebKitTransitionEventElapsedTime(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWebKitTransitionEventElapsedTime(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WebKitTransitionEvent* imp = static_cast<WebKitTransitionEvent*>(static_cast<JSWebKitTransitionEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->elapsedTime()); } -JSValuePtr jsWebKitTransitionEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWebKitTransitionEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSWebKitTransitionEvent*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSWebKitTransitionEvent::getConstructor(ExecState* exec) +JSValue JSWebKitTransitionEvent::getConstructor(ExecState* exec) { return getDOMConstructor<JSWebKitTransitionEventConstructor>(exec); } -JSValuePtr jsWebKitTransitionEventPrototypeFunctionInitWebKitTransitionEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsWebKitTransitionEventPrototypeFunctionInitWebKitTransitionEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSWebKitTransitionEvent::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWebKitTransitionEvent::s_info)) return throwError(exec, TypeError); JSWebKitTransitionEvent* castedThisObj = static_cast<JSWebKitTransitionEvent*>(asObject(thisValue)); WebKitTransitionEvent* imp = static_cast<WebKitTransitionEvent*>(castedThisObj->impl()); - const UString& typeArg = args.at(exec, 0)->toString(exec); - bool canBubbleArg = args.at(exec, 1)->toBoolean(exec); - bool cancelableArg = args.at(exec, 2)->toBoolean(exec); - const UString& propertyNameArg = args.at(exec, 3)->toString(exec); - double elapsedTimeArg = args.at(exec, 4)->toNumber(exec); + const UString& typeArg = args.at(0).toString(exec); + bool canBubbleArg = args.at(1).toBoolean(exec); + bool cancelableArg = args.at(2).toBoolean(exec); + const UString& propertyNameArg = args.at(3).toString(exec); + double elapsedTimeArg = args.at(4).toNumber(exec); imp->initWebKitTransitionEvent(typeArg, canBubbleArg, cancelableArg, propertyNameArg, elapsedTimeArg); return jsUndefined(); diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitTransitionEvent.h b/src/3rdparty/webkit/WebCore/generated/JSWebKitTransitionEvent.h index f342d474c5..de22ec358d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitTransitionEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitTransitionEvent.h @@ -31,27 +31,28 @@ class JSWebKitTransitionEvent : public JSEvent { typedef JSEvent Base; public: JSWebKitTransitionEvent(PassRefPtr<JSC::Structure>, PassRefPtr<WebKitTransitionEvent>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSWebKitTransitionEventPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -60,12 +61,12 @@ public: // Functions -JSC::JSValuePtr jsWebKitTransitionEventPrototypeFunctionInitWebKitTransitionEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWebKitTransitionEventPrototypeFunctionInitWebKitTransitionEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsWebKitTransitionEventPropertyName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitTransitionEventElapsedTime(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWebKitTransitionEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitTransitionEventPropertyName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitTransitionEventElapsedTime(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWebKitTransitionEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSWheelEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSWheelEvent.cpp index 752cd13cc5..a0fad0bb5f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWheelEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWheelEvent.cpp @@ -32,7 +32,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSWheelEvent) +ASSERT_CLASS_FITS_IN_CELL(JSWheelEvent); /* Hash table */ @@ -83,13 +83,13 @@ public: JSWheelEventConstructor(ExecState* exec) : DOMObject(JSWheelEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSWheelEventPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSWheelEventPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -118,9 +118,9 @@ static const HashTable JSWheelEventPrototypeTable = const ClassInfo JSWheelEventPrototype::s_info = { "WheelEventPrototype", 0, &JSWheelEventPrototypeTable, 0 }; -JSObject* JSWheelEventPrototype::self(ExecState* exec) +JSObject* JSWheelEventPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSWheelEvent>(exec); + return getDOMPrototype<JSWheelEvent>(exec, globalObject); } const ClassInfo JSWheelEvent::s_info = { "WheelEvent", &JSUIEvent::s_info, &JSWheelEventTable, 0 }; @@ -130,9 +130,9 @@ JSWheelEvent::JSWheelEvent(PassRefPtr<Structure> structure, PassRefPtr<WheelEven { } -JSObject* JSWheelEvent::createPrototype(ExecState* exec) +JSObject* JSWheelEvent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSWheelEventPrototype(JSWheelEventPrototype::createStructure(JSUIEventPrototype::self(exec))); + return new (exec) JSWheelEventPrototype(JSWheelEventPrototype::createStructure(JSUIEventPrototype::self(exec, globalObject))); } bool JSWheelEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -140,101 +140,116 @@ bool JSWheelEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propert return getStaticValueSlot<JSWheelEvent, Base>(exec, &JSWheelEventTable, this, propertyName, slot); } -JSValuePtr jsWheelEventScreenX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWheelEventScreenX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WheelEvent* imp = static_cast<WheelEvent*>(static_cast<JSWheelEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->screenX()); } -JSValuePtr jsWheelEventScreenY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWheelEventScreenY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WheelEvent* imp = static_cast<WheelEvent*>(static_cast<JSWheelEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->screenY()); } -JSValuePtr jsWheelEventClientX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWheelEventClientX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WheelEvent* imp = static_cast<WheelEvent*>(static_cast<JSWheelEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->clientX()); } -JSValuePtr jsWheelEventClientY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWheelEventClientY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WheelEvent* imp = static_cast<WheelEvent*>(static_cast<JSWheelEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->clientY()); } -JSValuePtr jsWheelEventCtrlKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWheelEventCtrlKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WheelEvent* imp = static_cast<WheelEvent*>(static_cast<JSWheelEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->ctrlKey()); } -JSValuePtr jsWheelEventShiftKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWheelEventShiftKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WheelEvent* imp = static_cast<WheelEvent*>(static_cast<JSWheelEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->shiftKey()); } -JSValuePtr jsWheelEventAltKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWheelEventAltKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WheelEvent* imp = static_cast<WheelEvent*>(static_cast<JSWheelEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->altKey()); } -JSValuePtr jsWheelEventMetaKey(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWheelEventMetaKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WheelEvent* imp = static_cast<WheelEvent*>(static_cast<JSWheelEvent*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->metaKey()); } -JSValuePtr jsWheelEventWheelDelta(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWheelEventWheelDelta(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WheelEvent* imp = static_cast<WheelEvent*>(static_cast<JSWheelEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->wheelDelta()); } -JSValuePtr jsWheelEventWheelDeltaX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWheelEventWheelDeltaX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WheelEvent* imp = static_cast<WheelEvent*>(static_cast<JSWheelEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->wheelDeltaX()); } -JSValuePtr jsWheelEventWheelDeltaY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWheelEventWheelDeltaY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WheelEvent* imp = static_cast<WheelEvent*>(static_cast<JSWheelEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->wheelDeltaY()); } -JSValuePtr jsWheelEventOffsetX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWheelEventOffsetX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WheelEvent* imp = static_cast<WheelEvent*>(static_cast<JSWheelEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->offsetX()); } -JSValuePtr jsWheelEventOffsetY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWheelEventOffsetY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WheelEvent* imp = static_cast<WheelEvent*>(static_cast<JSWheelEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->offsetY()); } -JSValuePtr jsWheelEventX(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWheelEventX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WheelEvent* imp = static_cast<WheelEvent*>(static_cast<JSWheelEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->x()); } -JSValuePtr jsWheelEventY(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWheelEventY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WheelEvent* imp = static_cast<WheelEvent*>(static_cast<JSWheelEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->y()); } -JSValuePtr jsWheelEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWheelEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSWheelEvent*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSWheelEvent::getConstructor(ExecState* exec) +JSValue JSWheelEvent::getConstructor(ExecState* exec) { return getDOMConstructor<JSWheelEventConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSWheelEvent.h b/src/3rdparty/webkit/WebCore/generated/JSWheelEvent.h index 4c2d5e8029..ae9730daab 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWheelEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWheelEvent.h @@ -31,23 +31,24 @@ class JSWheelEvent : public JSUIEvent { typedef JSUIEvent Base; public: JSWheelEvent(PassRefPtr<JSC::Structure>, PassRefPtr<WheelEvent>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSWheelEventPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSWheelEventPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -55,22 +56,22 @@ public: // Attributes -JSC::JSValuePtr jsWheelEventScreenX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWheelEventScreenY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWheelEventClientX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWheelEventClientY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWheelEventCtrlKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWheelEventShiftKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWheelEventAltKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWheelEventMetaKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWheelEventWheelDelta(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWheelEventWheelDeltaX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWheelEventWheelDeltaY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWheelEventOffsetX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWheelEventOffsetY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWheelEventX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWheelEventY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWheelEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWheelEventScreenX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWheelEventScreenY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWheelEventClientX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWheelEventClientY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWheelEventCtrlKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWheelEventShiftKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWheelEventAltKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWheelEventMetaKey(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWheelEventWheelDelta(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWheelEventWheelDeltaX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWheelEventWheelDeltaY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWheelEventOffsetX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWheelEventOffsetY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWheelEventX(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWheelEventY(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWheelEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorker.cpp b/src/3rdparty/webkit/WebCore/generated/JSWorker.cpp index e88aa9653d..55e80c555f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorker.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWorker.cpp @@ -41,7 +41,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSWorker) +ASSERT_CLASS_FITS_IN_CELL(JSWorker); /* Hash table */ @@ -80,9 +80,9 @@ static const HashTable JSWorkerPrototypeTable = const ClassInfo JSWorkerPrototype::s_info = { "WorkerPrototype", 0, &JSWorkerPrototypeTable, 0 }; -JSObject* JSWorkerPrototype::self(ExecState* exec) +JSObject* JSWorkerPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSWorker>(exec); + return getDOMPrototype<JSWorker>(exec, globalObject); } bool JSWorkerPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -101,12 +101,11 @@ JSWorker::JSWorker(PassRefPtr<Structure> structure, PassRefPtr<Worker> impl) JSWorker::~JSWorker() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSWorker::createPrototype(ExecState* exec) +JSObject* JSWorker::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSWorkerPrototype(JSWorkerPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSWorkerPrototype(JSWorkerPrototype::createStructure(globalObject->objectPrototype())); } bool JSWorker::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -114,64 +113,70 @@ bool JSWorker::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNam return getStaticValueSlot<JSWorker, Base>(exec, &JSWorkerTable, this, propertyName, slot); } -JSValuePtr jsWorkerOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Worker* imp = static_cast<Worker*>(static_cast<JSWorker*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onerror())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onerror()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsWorkerOnmessage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerOnmessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Worker* imp = static_cast<Worker*>(static_cast<JSWorker*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onmessage())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onmessage()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -void JSWorker::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSWorker::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { lookupPut<JSWorker, Base>(exec, propertyName, value, &JSWorkerTable, this, slot); } -void setJSWorkerOnerror(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSWorkerOnerror(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); Worker* imp = static_cast<Worker*>(static_cast<JSWorker*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnerror(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnerror(globalObject->createJSAttributeEventListener(value)); } -void setJSWorkerOnmessage(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSWorkerOnmessage(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); Worker* imp = static_cast<Worker*>(static_cast<JSWorker*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnmessage(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnmessage(globalObject->createJSAttributeEventListener(value)); } -JSValuePtr jsWorkerPrototypeFunctionPostMessage(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionPostMessage(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSWorker::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWorker::s_info)) return throwError(exec, TypeError); JSWorker* castedThisObj = static_cast<JSWorker*>(asObject(thisValue)); Worker* imp = static_cast<Worker*>(castedThisObj->impl()); - const UString& message = args.at(exec, 0)->toString(exec); + const UString& message = args.at(0).toString(exec); imp->postMessage(message); return jsUndefined(); } -JSValuePtr jsWorkerPrototypeFunctionTerminate(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionTerminate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSWorker::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWorker::s_info)) return throwError(exec, TypeError); JSWorker* castedThisObj = static_cast<JSWorker*>(asObject(thisValue)); Worker* imp = static_cast<Worker*>(castedThisObj->impl()); @@ -180,44 +185,47 @@ JSValuePtr jsWorkerPrototypeFunctionTerminate(ExecState* exec, JSObject*, JSValu return jsUndefined(); } -JSValuePtr jsWorkerPrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSWorker::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWorker::s_info)) return throwError(exec, TypeError); JSWorker* castedThisObj = static_cast<JSWorker*>(asObject(thisValue)); return castedThisObj->addEventListener(exec, args); } -JSValuePtr jsWorkerPrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSWorker::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWorker::s_info)) return throwError(exec, TypeError); JSWorker* castedThisObj = static_cast<JSWorker*>(asObject(thisValue)); return castedThisObj->removeEventListener(exec, args); } -JSValuePtr jsWorkerPrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSWorker::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWorker::s_info)) return throwError(exec, TypeError); JSWorker* castedThisObj = static_cast<JSWorker*>(asObject(thisValue)); Worker* imp = static_cast<Worker*>(castedThisObj->impl()); ExceptionCode ec = 0; - Event* evt = toEvent(args.at(exec, 0)); + Event* evt = toEvent(args.at(0)); - JSC::JSValuePtr result = jsBoolean(imp->dispatchEvent(evt, ec)); + JSC::JSValue result = jsBoolean(imp->dispatchEvent(evt, ec)); setDOMException(exec, ec); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, Worker* object) +JSC::JSValue toJS(JSC::ExecState* exec, Worker* object) { return getDOMObjectWrapper<JSWorker>(exec, object); } -Worker* toWorker(JSC::JSValuePtr value) +Worker* toWorker(JSC::JSValue value) { - return value->isObject(&JSWorker::s_info) ? static_cast<JSWorker*>(asObject(value))->impl() : 0; + return value.isObject(&JSWorker::s_info) ? static_cast<JSWorker*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorker.h b/src/3rdparty/webkit/WebCore/generated/JSWorker.h index 98e26cf02c..069e0c9327 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorker.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWorker.h @@ -37,13 +37,13 @@ class JSWorker : public DOMObject { public: JSWorker(PassRefPtr<JSC::Structure>, PassRefPtr<Worker>); virtual ~JSWorker(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -52,24 +52,25 @@ public: // Custom functions - JSC::JSValuePtr addEventListener(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr removeEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue addEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue removeEventListener(JSC::ExecState*, const JSC::ArgList&); Worker* impl() const { return m_impl.get(); } private: RefPtr<Worker> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, Worker*); -Worker* toWorker(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, Worker*); +Worker* toWorker(JSC::JSValue); class JSWorkerPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -78,17 +79,17 @@ public: // Functions -JSC::JSValuePtr jsWorkerPrototypeFunctionPostMessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsWorkerPrototypeFunctionTerminate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsWorkerPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsWorkerPrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsWorkerPrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionPostMessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionTerminate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsWorkerOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSWorkerOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsWorkerOnmessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSWorkerOnmessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsWorkerOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWorkerOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWorkerOnmessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWorkerOnmessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorkerContext.cpp b/src/3rdparty/webkit/WebCore/generated/JSWorkerContext.cpp index f0702ea9d5..1e71820252 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorkerContext.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWorkerContext.cpp @@ -32,8 +32,10 @@ #include "JSEvent.h" #include "JSEventListener.h" #include "JSMessageEvent.h" +#include "JSWorkerContext.h" #include "JSWorkerLocation.h" #include "JSWorkerNavigator.h" +#include "JSXMLHttpRequest.h" #include "WorkerContext.h" #include "WorkerLocation.h" #include "WorkerNavigator.h" @@ -44,18 +46,19 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSWorkerContext) +ASSERT_CLASS_FITS_IN_CELL(JSWorkerContext); /* Hash table */ -static const HashTableValue JSWorkerContextTableValues[7] = +static const HashTableValue JSWorkerContextTableValues[8] = { { "self", DontDelete, (intptr_t)jsWorkerContextSelf, (intptr_t)setJSWorkerContextSelf }, - { "onmessage", DontDelete, (intptr_t)jsWorkerContextOnmessage, (intptr_t)setJSWorkerContextOnmessage }, { "location", DontDelete, (intptr_t)jsWorkerContextLocation, (intptr_t)setJSWorkerContextLocation }, { "navigator", DontDelete, (intptr_t)jsWorkerContextNavigator, (intptr_t)setJSWorkerContextNavigator }, + { "onmessage", DontDelete, (intptr_t)jsWorkerContextOnmessage, (intptr_t)setJSWorkerContextOnmessage }, { "MessageEvent", DontDelete, (intptr_t)jsWorkerContextMessageEventConstructor, (intptr_t)setJSWorkerContextMessageEventConstructor }, { "WorkerLocation", DontDelete, (intptr_t)jsWorkerContextWorkerLocationConstructor, (intptr_t)setJSWorkerContextWorkerLocationConstructor }, + { "XMLHttpRequest", DontDelete, (intptr_t)jsWorkerContextXMLHttpRequestConstructor, (intptr_t)setJSWorkerContextXMLHttpRequestConstructor }, { 0, 0, 0, 0 } }; @@ -68,9 +71,15 @@ static const HashTable JSWorkerContextTable = /* Hash table for prototype */ -static const HashTableValue JSWorkerContextPrototypeTableValues[5] = +static const HashTableValue JSWorkerContextPrototypeTableValues[11] = { + { "close", DontDelete|Function, (intptr_t)jsWorkerContextPrototypeFunctionClose, (intptr_t)0 }, + { "importScripts", DontDelete|Function, (intptr_t)jsWorkerContextPrototypeFunctionImportScripts, (intptr_t)0 }, { "postMessage", DontDelete|Function, (intptr_t)jsWorkerContextPrototypeFunctionPostMessage, (intptr_t)1 }, + { "setTimeout", DontDelete|Function, (intptr_t)jsWorkerContextPrototypeFunctionSetTimeout, (intptr_t)2 }, + { "clearTimeout", DontDelete|Function, (intptr_t)jsWorkerContextPrototypeFunctionClearTimeout, (intptr_t)1 }, + { "setInterval", DontDelete|Function, (intptr_t)jsWorkerContextPrototypeFunctionSetInterval, (intptr_t)2 }, + { "clearInterval", DontDelete|Function, (intptr_t)jsWorkerContextPrototypeFunctionClearInterval, (intptr_t)1 }, { "addEventListener", DontDelete|Function, (intptr_t)jsWorkerContextPrototypeFunctionAddEventListener, (intptr_t)3 }, { "removeEventListener", DontDelete|Function, (intptr_t)jsWorkerContextPrototypeFunctionRemoveEventListener, (intptr_t)3 }, { "dispatchEvent", DontDelete|Function, (intptr_t)jsWorkerContextPrototypeFunctionDispatchEvent, (intptr_t)1 }, @@ -79,9 +88,9 @@ static const HashTableValue JSWorkerContextPrototypeTableValues[5] = static const HashTable JSWorkerContextPrototypeTable = #if ENABLE(PERFECT_HASH_SIZE) - { 7, JSWorkerContextPrototypeTableValues, 0 }; + { 1023, JSWorkerContextPrototypeTableValues, 0 }; #else - { 8, 7, JSWorkerContextPrototypeTableValues, 0 }; + { 34, 31, JSWorkerContextPrototypeTableValues, 0 }; #endif static const HashTable* getJSWorkerContextPrototypeTable(ExecState* exec) @@ -118,121 +127,212 @@ bool JSWorkerContext::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSWorkerContext, Base>(exec, getJSWorkerContextTable(exec), this, propertyName, slot); } -JSValuePtr jsWorkerContextSelf(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerContextSelf(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast<JSWorkerContext*>(asObject(slot.slotBase()))->self(exec); + UNUSED_PARAM(exec); + WorkerContext* imp = static_cast<WorkerContext*>(static_cast<JSWorkerContext*>(asObject(slot.slotBase()))->impl()); + return toJS(exec, WTF::getPtr(imp->self())); } -JSValuePtr jsWorkerContextOnmessage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerContextLocation(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WorkerContext* imp = static_cast<WorkerContext*>(static_cast<JSWorkerContext*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onmessage())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; - } - return jsNull(); + return toJS(exec, WTF::getPtr(imp->location())); } -JSValuePtr jsWorkerContextLocation(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerContextNavigator(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WorkerContext* imp = static_cast<WorkerContext*>(static_cast<JSWorkerContext*>(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->location())); + return toJS(exec, WTF::getPtr(imp->navigator())); } -JSValuePtr jsWorkerContextNavigator(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerContextOnmessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WorkerContext* imp = static_cast<WorkerContext*>(static_cast<JSWorkerContext*>(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->navigator())); + if (EventListener* listener = imp->onmessage()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); } -JSValuePtr jsWorkerContextMessageEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerContextMessageEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(slot); return JSMessageEvent::getConstructor(exec); } -JSValuePtr jsWorkerContextWorkerLocationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerContextWorkerLocationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(slot); return JSWorkerLocation::getConstructor(exec); } -void JSWorkerContext::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +JSValue jsWorkerContextXMLHttpRequestConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - lookupPut<JSWorkerContext, Base>(exec, propertyName, value, getJSWorkerContextTable(exec), this, slot); + return static_cast<JSWorkerContext*>(asObject(slot.slotBase()))->xmlHttpRequest(exec); } -void setJSWorkerContextSelf(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void JSWorkerContext::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { - static_cast<JSWorkerContext*>(thisObject)->setSelf(exec, value); + lookupPut<JSWorkerContext, Base>(exec, propertyName, value, getJSWorkerContextTable(exec), this, slot); } -void setJSWorkerContextOnmessage(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSWorkerContextSelf(ExecState* exec, JSObject* thisObject, JSValue value) { - WorkerContext* imp = static_cast<WorkerContext*>(static_cast<JSWorkerContext*>(thisObject)->impl()); - JSDOMGlobalObject* globalObject = static_cast<JSWorkerContext*>(thisObject); - imp->setOnmessage(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + // Shadowing a built-in object + static_cast<JSWorkerContext*>(thisObject)->putDirect(Identifier(exec, "self"), value); } -void setJSWorkerContextLocation(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSWorkerContextLocation(ExecState* exec, JSObject* thisObject, JSValue value) { + // Shadowing a built-in object static_cast<JSWorkerContext*>(thisObject)->putDirect(Identifier(exec, "location"), value); } -void setJSWorkerContextNavigator(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSWorkerContextNavigator(ExecState* exec, JSObject* thisObject, JSValue value) { + // Shadowing a built-in object static_cast<JSWorkerContext*>(thisObject)->putDirect(Identifier(exec, "navigator"), value); } -void setJSWorkerContextMessageEventConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSWorkerContextOnmessage(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + WorkerContext* imp = static_cast<WorkerContext*>(static_cast<JSWorkerContext*>(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast<JSWorkerContext*>(thisObject); + imp->setOnmessage(globalObject->createJSAttributeEventListener(value)); +} + +void setJSWorkerContextMessageEventConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { // Shadowing a built-in constructor static_cast<JSWorkerContext*>(thisObject)->putDirect(Identifier(exec, "MessageEvent"), value); } -void setJSWorkerContextWorkerLocationConstructor(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSWorkerContextWorkerLocationConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { // Shadowing a built-in constructor static_cast<JSWorkerContext*>(thisObject)->putDirect(Identifier(exec, "WorkerLocation"), value); } -JSValuePtr jsWorkerContextPrototypeFunctionPostMessage(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +void setJSWorkerContextXMLHttpRequestConstructor(ExecState* exec, JSObject* thisObject, JSValue value) +{ + // Shadowing a built-in constructor + static_cast<JSWorkerContext*>(thisObject)->putDirect(Identifier(exec, "XMLHttpRequest"), value); +} + +JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionClose(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWorkerContext::s_info)) + return throwError(exec, TypeError); + JSWorkerContext* castedThisObj = static_cast<JSWorkerContext*>(asObject(thisValue)); + WorkerContext* imp = static_cast<WorkerContext*>(castedThisObj->impl()); + + imp->close(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionImportScripts(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWorkerContext::s_info)) + return throwError(exec, TypeError); + JSWorkerContext* castedThisObj = static_cast<JSWorkerContext*>(asObject(thisValue)); + return castedThisObj->importScripts(exec, args); +} + +JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionPostMessage(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSWorkerContext::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWorkerContext::s_info)) return throwError(exec, TypeError); JSWorkerContext* castedThisObj = static_cast<JSWorkerContext*>(asObject(thisValue)); WorkerContext* imp = static_cast<WorkerContext*>(castedThisObj->impl()); - const UString& message = args.at(exec, 0)->toString(exec); + const UString& message = args.at(0).toString(exec); imp->postMessage(message); return jsUndefined(); } -JSValuePtr jsWorkerContextPrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionSetTimeout(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWorkerContext::s_info)) + return throwError(exec, TypeError); + JSWorkerContext* castedThisObj = static_cast<JSWorkerContext*>(asObject(thisValue)); + return castedThisObj->setTimeout(exec, args); +} + +JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionClearTimeout(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWorkerContext::s_info)) + return throwError(exec, TypeError); + JSWorkerContext* castedThisObj = static_cast<JSWorkerContext*>(asObject(thisValue)); + WorkerContext* imp = static_cast<WorkerContext*>(castedThisObj->impl()); + int handle = args.at(0).toInt32(exec); + + imp->clearTimeout(handle); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionSetInterval(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWorkerContext::s_info)) + return throwError(exec, TypeError); + JSWorkerContext* castedThisObj = static_cast<JSWorkerContext*>(asObject(thisValue)); + return castedThisObj->setInterval(exec, args); +} + +JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionClearInterval(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWorkerContext::s_info)) + return throwError(exec, TypeError); + JSWorkerContext* castedThisObj = static_cast<JSWorkerContext*>(asObject(thisValue)); + WorkerContext* imp = static_cast<WorkerContext*>(castedThisObj->impl()); + int handle = args.at(0).toInt32(exec); + + imp->clearInterval(handle); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSWorkerContext::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWorkerContext::s_info)) return throwError(exec, TypeError); JSWorkerContext* castedThisObj = static_cast<JSWorkerContext*>(asObject(thisValue)); return castedThisObj->addEventListener(exec, args); } -JSValuePtr jsWorkerContextPrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSWorkerContext::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWorkerContext::s_info)) return throwError(exec, TypeError); JSWorkerContext* castedThisObj = static_cast<JSWorkerContext*>(asObject(thisValue)); return castedThisObj->removeEventListener(exec, args); } -JSValuePtr jsWorkerContextPrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSWorkerContext::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWorkerContext::s_info)) return throwError(exec, TypeError); JSWorkerContext* castedThisObj = static_cast<JSWorkerContext*>(asObject(thisValue)); WorkerContext* imp = static_cast<WorkerContext*>(castedThisObj->impl()); ExceptionCode ec = 0; - Event* evt = toEvent(args.at(exec, 0)); + Event* evt = toEvent(args.at(0)); - JSC::JSValuePtr result = jsBoolean(imp->dispatchEvent(evt, ec)); + JSC::JSValue result = jsBoolean(imp->dispatchEvent(evt, ec)); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorkerContext.h b/src/3rdparty/webkit/WebCore/generated/JSWorkerContext.h index fe04c1829e..8b9f617465 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorkerContext.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWorkerContext.h @@ -36,11 +36,11 @@ public: JSWorkerContext(PassRefPtr<JSC::Structure>, PassRefPtr<WorkerContext>); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); bool customGetOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,22 +49,25 @@ public: // Custom attributes - JSC::JSValuePtr self(JSC::ExecState*) const; - void setSelf(JSC::ExecState*, JSC::JSValuePtr); + JSC::JSValue xmlHttpRequest(JSC::ExecState*) const; // Custom functions - JSC::JSValuePtr addEventListener(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr removeEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue importScripts(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setTimeout(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setInterval(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue addEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue removeEventListener(JSC::ExecState*, const JSC::ArgList&); }; class JSWorkerContextPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: void* operator new(size_t, JSC::JSGlobalData*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -73,24 +76,32 @@ public: // Functions -JSC::JSValuePtr jsWorkerContextPrototypeFunctionPostMessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsWorkerContextPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsWorkerContextPrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsWorkerContextPrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionClose(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionImportScripts(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionPostMessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionSetTimeout(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionClearTimeout(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionSetInterval(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionClearInterval(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsWorkerContextSelf(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSWorkerContextSelf(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsWorkerContextOnmessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSWorkerContextOnmessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsWorkerContextLocation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSWorkerContextLocation(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsWorkerContextNavigator(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSWorkerContextNavigator(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsWorkerContextMessageEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSWorkerContextMessageEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsWorkerContextWorkerLocationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSWorkerContextWorkerLocationConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); +JSC::JSValue jsWorkerContextSelf(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWorkerContextSelf(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWorkerContextLocation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWorkerContextLocation(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWorkerContextNavigator(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWorkerContextNavigator(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWorkerContextOnmessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWorkerContextOnmessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWorkerContextMessageEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWorkerContextMessageEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWorkerContextWorkerLocationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWorkerContextWorkerLocationConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWorkerContextXMLHttpRequestConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWorkerContextXMLHttpRequestConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorkerContextBase.lut.h b/src/3rdparty/webkit/WebCore/generated/JSWorkerContextBase.lut.h index 6f02e02394..e69de29bb2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorkerContextBase.lut.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWorkerContextBase.lut.h @@ -1,18 +0,0 @@ -// Automatically generated from ../bindings/js/JSWorkerContextBase.cpp using WebCore/../JavaScriptCore/create_hash_table. DO NOT EDIT! - -namespace WebCore { - -using namespace JSC; - -static const struct HashTableValue JSWorkerContextBaseTableValues[1] = { - { 0, 0, 0, 0 } -}; - -extern const struct HashTable JSWorkerContextBaseTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 0, JSWorkerContextBaseTableValues, 0 }; -#else - { 1, 0, JSWorkerContextBaseTableValues, 0 }; -#endif - -} // namespace diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorkerLocation.cpp b/src/3rdparty/webkit/WebCore/generated/JSWorkerLocation.cpp index 84396577ea..188f6cbe63 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorkerLocation.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWorkerLocation.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSWorkerLocation) +ASSERT_CLASS_FITS_IN_CELL(JSWorkerLocation); /* Hash table */ @@ -82,13 +82,13 @@ public: JSWorkerLocationConstructor(ExecState* exec) : DOMObject(JSWorkerLocationConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSWorkerLocationPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSWorkerLocationPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -122,9 +122,9 @@ static const HashTable* getJSWorkerLocationPrototypeTable(ExecState* exec) } const ClassInfo JSWorkerLocationPrototype::s_info = { "WorkerLocationPrototype", 0, 0, getJSWorkerLocationPrototypeTable }; -JSObject* JSWorkerLocationPrototype::self(ExecState* exec) +JSObject* JSWorkerLocationPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSWorkerLocation>(exec); + return getDOMPrototype<JSWorkerLocation>(exec, globalObject); } bool JSWorkerLocationPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -147,12 +147,11 @@ JSWorkerLocation::JSWorkerLocation(PassRefPtr<Structure> structure, PassRefPtr<W JSWorkerLocation::~JSWorkerLocation() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSWorkerLocation::createPrototype(ExecState* exec) +JSObject* JSWorkerLocation::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSWorkerLocationPrototype(JSWorkerLocationPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSWorkerLocationPrototype(JSWorkerLocationPrototype::createStructure(globalObject->objectPrototype())); } bool JSWorkerLocation::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -160,82 +159,91 @@ bool JSWorkerLocation::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSWorkerLocation, Base>(exec, getJSWorkerLocationTable(exec), this, propertyName, slot); } -JSValuePtr jsWorkerLocationHref(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerLocationHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WorkerLocation* imp = static_cast<WorkerLocation*>(static_cast<JSWorkerLocation*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->href()); } -JSValuePtr jsWorkerLocationProtocol(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerLocationProtocol(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WorkerLocation* imp = static_cast<WorkerLocation*>(static_cast<JSWorkerLocation*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->protocol()); } -JSValuePtr jsWorkerLocationHost(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerLocationHost(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WorkerLocation* imp = static_cast<WorkerLocation*>(static_cast<JSWorkerLocation*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->host()); } -JSValuePtr jsWorkerLocationHostname(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerLocationHostname(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WorkerLocation* imp = static_cast<WorkerLocation*>(static_cast<JSWorkerLocation*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->hostname()); } -JSValuePtr jsWorkerLocationPort(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerLocationPort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WorkerLocation* imp = static_cast<WorkerLocation*>(static_cast<JSWorkerLocation*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->port()); } -JSValuePtr jsWorkerLocationPathname(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerLocationPathname(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WorkerLocation* imp = static_cast<WorkerLocation*>(static_cast<JSWorkerLocation*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->pathname()); } -JSValuePtr jsWorkerLocationSearch(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerLocationSearch(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WorkerLocation* imp = static_cast<WorkerLocation*>(static_cast<JSWorkerLocation*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->search()); } -JSValuePtr jsWorkerLocationHash(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerLocationHash(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WorkerLocation* imp = static_cast<WorkerLocation*>(static_cast<JSWorkerLocation*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->hash()); } -JSValuePtr jsWorkerLocationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerLocationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSWorkerLocation*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSWorkerLocation::getConstructor(ExecState* exec) +JSValue JSWorkerLocation::getConstructor(ExecState* exec) { return getDOMConstructor<JSWorkerLocationConstructor>(exec); } -JSValuePtr jsWorkerLocationPrototypeFunctionToString(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsWorkerLocationPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSWorkerLocation::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSWorkerLocation::s_info)) return throwError(exec, TypeError); JSWorkerLocation* castedThisObj = static_cast<JSWorkerLocation*>(asObject(thisValue)); WorkerLocation* imp = static_cast<WorkerLocation*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsString(exec, imp->toString()); + JSC::JSValue result = jsString(exec, imp->toString()); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, WorkerLocation* object) +JSC::JSValue toJS(JSC::ExecState* exec, WorkerLocation* object) { return getDOMObjectWrapper<JSWorkerLocation>(exec, object); } -WorkerLocation* toWorkerLocation(JSC::JSValuePtr value) +WorkerLocation* toWorkerLocation(JSC::JSValue value) { - return value->isObject(&JSWorkerLocation::s_info) ? static_cast<JSWorkerLocation*>(asObject(value))->impl() : 0; + return value.isObject(&JSWorkerLocation::s_info) ? static_cast<JSWorkerLocation*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorkerLocation.h b/src/3rdparty/webkit/WebCore/generated/JSWorkerLocation.h index 161b8a9ee2..f2da5c8aa3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorkerLocation.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWorkerLocation.h @@ -37,33 +37,34 @@ class JSWorkerLocation : public DOMObject { public: JSWorkerLocation(PassRefPtr<JSC::Structure>, PassRefPtr<WorkerLocation>); virtual ~JSWorkerLocation(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); WorkerLocation* impl() const { return m_impl.get(); } private: RefPtr<WorkerLocation> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, WorkerLocation*); -WorkerLocation* toWorkerLocation(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, WorkerLocation*); +WorkerLocation* toWorkerLocation(JSC::JSValue); class JSWorkerLocationPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -72,18 +73,18 @@ public: // Functions -JSC::JSValuePtr jsWorkerLocationPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsWorkerLocationPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsWorkerLocationHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWorkerLocationProtocol(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWorkerLocationHost(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWorkerLocationHostname(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWorkerLocationPort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWorkerLocationPathname(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWorkerLocationSearch(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWorkerLocationHash(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWorkerLocationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWorkerLocationHref(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWorkerLocationProtocol(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWorkerLocationHost(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWorkerLocationHostname(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWorkerLocationPort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWorkerLocationPathname(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWorkerLocationSearch(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWorkerLocationHash(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWorkerLocationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.cpp b/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.cpp index 25a30af78b..5a819b5fb7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSWorkerNavigator) +ASSERT_CLASS_FITS_IN_CELL(JSWorkerNavigator); /* Hash table */ @@ -77,9 +77,9 @@ static const HashTable* getJSWorkerNavigatorPrototypeTable(ExecState* exec) } const ClassInfo JSWorkerNavigatorPrototype::s_info = { "WorkerNavigatorPrototype", 0, 0, getJSWorkerNavigatorPrototypeTable }; -JSObject* JSWorkerNavigatorPrototype::self(ExecState* exec) +JSObject* JSWorkerNavigatorPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSWorkerNavigator>(exec); + return getDOMPrototype<JSWorkerNavigator>(exec, globalObject); } static const HashTable* getJSWorkerNavigatorTable(ExecState* exec) @@ -97,12 +97,11 @@ JSWorkerNavigator::JSWorkerNavigator(PassRefPtr<Structure> structure, PassRefPtr JSWorkerNavigator::~JSWorkerNavigator() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSWorkerNavigator::createPrototype(ExecState* exec) +JSObject* JSWorkerNavigator::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSWorkerNavigatorPrototype(JSWorkerNavigatorPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSWorkerNavigatorPrototype(JSWorkerNavigatorPrototype::createStructure(globalObject->objectPrototype())); } bool JSWorkerNavigator::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -110,43 +109,48 @@ bool JSWorkerNavigator::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSWorkerNavigator, Base>(exec, getJSWorkerNavigatorTable(exec), this, propertyName, slot); } -JSValuePtr jsWorkerNavigatorAppName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerNavigatorAppName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WorkerNavigator* imp = static_cast<WorkerNavigator*>(static_cast<JSWorkerNavigator*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->appName()); } -JSValuePtr jsWorkerNavigatorAppVersion(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerNavigatorAppVersion(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WorkerNavigator* imp = static_cast<WorkerNavigator*>(static_cast<JSWorkerNavigator*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->appVersion()); } -JSValuePtr jsWorkerNavigatorPlatform(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerNavigatorPlatform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WorkerNavigator* imp = static_cast<WorkerNavigator*>(static_cast<JSWorkerNavigator*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->platform()); } -JSValuePtr jsWorkerNavigatorUserAgent(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerNavigatorUserAgent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WorkerNavigator* imp = static_cast<WorkerNavigator*>(static_cast<JSWorkerNavigator*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->userAgent()); } -JSValuePtr jsWorkerNavigatorOnLine(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerNavigatorOnLine(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); WorkerNavigator* imp = static_cast<WorkerNavigator*>(static_cast<JSWorkerNavigator*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->onLine()); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, WorkerNavigator* object) +JSC::JSValue toJS(JSC::ExecState* exec, WorkerNavigator* object) { return getDOMObjectWrapper<JSWorkerNavigator>(exec, object); } -WorkerNavigator* toWorkerNavigator(JSC::JSValuePtr value) +WorkerNavigator* toWorkerNavigator(JSC::JSValue value) { - return value->isObject(&JSWorkerNavigator::s_info) ? static_cast<JSWorkerNavigator*>(asObject(value))->impl() : 0; + return value.isObject(&JSWorkerNavigator::s_info) ? static_cast<JSWorkerNavigator*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.h b/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.h index b2804581c3..8baacde01b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.h @@ -37,12 +37,12 @@ class JSWorkerNavigator : public DOMObject { public: JSWorkerNavigator(PassRefPtr<JSC::Structure>, PassRefPtr<WorkerNavigator>); virtual ~JSWorkerNavigator(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -53,12 +53,13 @@ private: RefPtr<WorkerNavigator> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, WorkerNavigator*); -WorkerNavigator* toWorkerNavigator(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, WorkerNavigator*); +WorkerNavigator* toWorkerNavigator(JSC::JSValue); class JSWorkerNavigatorPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSWorkerNavigatorPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -66,11 +67,11 @@ public: // Attributes -JSC::JSValuePtr jsWorkerNavigatorAppName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWorkerNavigatorAppVersion(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWorkerNavigatorPlatform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWorkerNavigatorUserAgent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsWorkerNavigatorOnLine(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWorkerNavigatorAppName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWorkerNavigatorAppVersion(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWorkerNavigatorPlatform(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWorkerNavigatorUserAgent(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsWorkerNavigatorOnLine(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.cpp b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.cpp index a326915a74..a2acb0cbe8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.cpp @@ -45,11 +45,11 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSXMLHttpRequest) +ASSERT_CLASS_FITS_IN_CELL(JSXMLHttpRequest); /* Hash table */ -static const HashTableValue JSXMLHttpRequestTableValues[13] = +static const HashTableValue JSXMLHttpRequestTableValues[14] = { { "onabort", DontDelete, (intptr_t)jsXMLHttpRequestOnabort, (intptr_t)setJSXMLHttpRequestOnabort }, { "onerror", DontDelete, (intptr_t)jsXMLHttpRequestOnerror, (intptr_t)setJSXMLHttpRequestOnerror }, @@ -58,6 +58,7 @@ static const HashTableValue JSXMLHttpRequestTableValues[13] = { "onprogress", DontDelete, (intptr_t)jsXMLHttpRequestOnprogress, (intptr_t)setJSXMLHttpRequestOnprogress }, { "onreadystatechange", DontDelete, (intptr_t)jsXMLHttpRequestOnreadystatechange, (intptr_t)setJSXMLHttpRequestOnreadystatechange }, { "readyState", DontDelete|ReadOnly, (intptr_t)jsXMLHttpRequestReadyState, (intptr_t)0 }, + { "withCredentials", DontDelete, (intptr_t)jsXMLHttpRequestWithCredentials, (intptr_t)setJSXMLHttpRequestWithCredentials }, { "upload", DontDelete|ReadOnly, (intptr_t)jsXMLHttpRequestUpload, (intptr_t)0 }, { "responseText", DontDelete|ReadOnly, (intptr_t)jsXMLHttpRequestResponseText, (intptr_t)0 }, { "responseXML", DontDelete|ReadOnly, (intptr_t)jsXMLHttpRequestResponseXML, (intptr_t)0 }, @@ -70,7 +71,7 @@ static const HashTable JSXMLHttpRequestTable = #if ENABLE(PERFECT_HASH_SIZE) { 127, JSXMLHttpRequestTableValues, 0 }; #else - { 34, 31, JSXMLHttpRequestTableValues, 0 }; + { 35, 31, JSXMLHttpRequestTableValues, 0 }; #endif /* Hash table for prototype */ @@ -102,19 +103,27 @@ static const HashTable JSXMLHttpRequestPrototypeTable = { 37, 31, JSXMLHttpRequestPrototypeTableValues, 0 }; #endif -const ClassInfo JSXMLHttpRequestPrototype::s_info = { "XMLHttpRequestPrototype", 0, &JSXMLHttpRequestPrototypeTable, 0 }; +static const HashTable* getJSXMLHttpRequestPrototypeTable(ExecState* exec) +{ + return getHashTableForGlobalData(exec->globalData(), &JSXMLHttpRequestPrototypeTable); +} +const ClassInfo JSXMLHttpRequestPrototype::s_info = { "XMLHttpRequestPrototype", 0, 0, getJSXMLHttpRequestPrototypeTable }; -JSObject* JSXMLHttpRequestPrototype::self(ExecState* exec) +JSObject* JSXMLHttpRequestPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSXMLHttpRequest>(exec); + return getDOMPrototype<JSXMLHttpRequest>(exec, globalObject); } bool JSXMLHttpRequestPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { - return getStaticPropertySlot<JSXMLHttpRequestPrototype, JSObject>(exec, &JSXMLHttpRequestPrototypeTable, this, propertyName, slot); + return getStaticPropertySlot<JSXMLHttpRequestPrototype, JSObject>(exec, getJSXMLHttpRequestPrototypeTable(exec), this, propertyName, slot); } -const ClassInfo JSXMLHttpRequest::s_info = { "XMLHttpRequest", 0, &JSXMLHttpRequestTable, 0 }; +static const HashTable* getJSXMLHttpRequestTable(ExecState* exec) +{ + return getHashTableForGlobalData(exec->globalData(), &JSXMLHttpRequestTable); +} +const ClassInfo JSXMLHttpRequest::s_info = { "XMLHttpRequest", 0, 0, getJSXMLHttpRequestTable }; JSXMLHttpRequest::JSXMLHttpRequest(PassRefPtr<Structure> structure, PassRefPtr<XMLHttpRequest> impl) : DOMObject(structure) @@ -125,206 +134,239 @@ JSXMLHttpRequest::JSXMLHttpRequest(PassRefPtr<Structure> structure, PassRefPtr<X JSXMLHttpRequest::~JSXMLHttpRequest() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSXMLHttpRequest::createPrototype(ExecState* exec) +JSObject* JSXMLHttpRequest::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSXMLHttpRequestPrototype(JSXMLHttpRequestPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSXMLHttpRequestPrototype(JSXMLHttpRequestPrototype::createStructure(globalObject->objectPrototype())); } bool JSXMLHttpRequest::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { - return getStaticValueSlot<JSXMLHttpRequest, Base>(exec, &JSXMLHttpRequestTable, this, propertyName, slot); + return getStaticValueSlot<JSXMLHttpRequest, Base>(exec, getJSXMLHttpRequestTable(exec), this, propertyName, slot); } -JSValuePtr jsXMLHttpRequestOnabort(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestOnabort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onabort())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onabort()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsXMLHttpRequestOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onerror())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onerror()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsXMLHttpRequestOnload(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestOnload(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onload())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onload()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsXMLHttpRequestOnloadstart(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestOnloadstart(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onloadstart())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onloadstart()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsXMLHttpRequestOnprogress(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestOnprogress(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onprogress())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onprogress()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsXMLHttpRequestOnreadystatechange(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestOnreadystatechange(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onreadystatechange())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onreadystatechange()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsXMLHttpRequestReadyState(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestReadyState(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->readyState()); } -JSValuePtr jsXMLHttpRequestUpload(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestWithCredentials(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); + XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(asObject(slot.slotBase()))->impl()); + return jsBoolean(imp->withCredentials()); +} + +JSValue jsXMLHttpRequestUpload(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + UNUSED_PARAM(exec); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->upload())); } -JSValuePtr jsXMLHttpRequestResponseText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestResponseText(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSXMLHttpRequest*>(asObject(slot.slotBase()))->responseText(exec); } -JSValuePtr jsXMLHttpRequestResponseXML(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestResponseXML(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->responseXML())); } -JSValuePtr jsXMLHttpRequestStatus(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestStatus(ExecState* exec, const Identifier&, const PropertySlot& slot) { ExceptionCode ec = 0; XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(asObject(slot.slotBase()))->impl()); - JSC::JSValuePtr result = jsNumber(exec, imp->status(ec)); + JSC::JSValue result = jsNumber(exec, imp->status(ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsXMLHttpRequestStatusText(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestStatusText(ExecState* exec, const Identifier&, const PropertySlot& slot) { ExceptionCode ec = 0; XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(asObject(slot.slotBase()))->impl()); - JSC::JSValuePtr result = jsString(exec, imp->statusText(ec)); + JSC::JSValue result = jsString(exec, imp->statusText(ec)); setDOMException(exec, ec); return result; } -void JSXMLHttpRequest::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSXMLHttpRequest::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { - lookupPut<JSXMLHttpRequest, Base>(exec, propertyName, value, &JSXMLHttpRequestTable, this, slot); + lookupPut<JSXMLHttpRequest, Base>(exec, propertyName, value, getJSXMLHttpRequestTable(exec), this, slot); } -void setJSXMLHttpRequestOnabort(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSXMLHttpRequestOnabort(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnabort(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnabort(globalObject->createJSAttributeEventListener(value)); } -void setJSXMLHttpRequestOnerror(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSXMLHttpRequestOnerror(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnerror(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnerror(globalObject->createJSAttributeEventListener(value)); } -void setJSXMLHttpRequestOnload(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSXMLHttpRequestOnload(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnload(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnload(globalObject->createJSAttributeEventListener(value)); } -void setJSXMLHttpRequestOnloadstart(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSXMLHttpRequestOnloadstart(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnloadstart(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnloadstart(globalObject->createJSAttributeEventListener(value)); } -void setJSXMLHttpRequestOnprogress(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSXMLHttpRequestOnprogress(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnprogress(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnprogress(globalObject->createJSAttributeEventListener(value)); } -void setJSXMLHttpRequestOnreadystatechange(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSXMLHttpRequestOnreadystatechange(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnreadystatechange(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnreadystatechange(globalObject->createJSAttributeEventListener(value)); +} + +void setJSXMLHttpRequestWithCredentials(ExecState* exec, JSObject* thisObject, JSValue value) +{ + XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(static_cast<JSXMLHttpRequest*>(thisObject)->impl()); + ExceptionCode ec = 0; + imp->setWithCredentials(value.toBoolean(exec), ec); + setDOMException(exec, ec); } -JSValuePtr jsXMLHttpRequestPrototypeFunctionOpen(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionOpen(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXMLHttpRequest::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXMLHttpRequest::s_info)) return throwError(exec, TypeError); JSXMLHttpRequest* castedThisObj = static_cast<JSXMLHttpRequest*>(asObject(thisValue)); return castedThisObj->open(exec, args); } -JSValuePtr jsXMLHttpRequestPrototypeFunctionSetRequestHeader(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionSetRequestHeader(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXMLHttpRequest::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXMLHttpRequest::s_info)) return throwError(exec, TypeError); JSXMLHttpRequest* castedThisObj = static_cast<JSXMLHttpRequest*>(asObject(thisValue)); return castedThisObj->setRequestHeader(exec, args); } -JSValuePtr jsXMLHttpRequestPrototypeFunctionSend(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionSend(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXMLHttpRequest::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXMLHttpRequest::s_info)) return throwError(exec, TypeError); JSXMLHttpRequest* castedThisObj = static_cast<JSXMLHttpRequest*>(asObject(thisValue)); return castedThisObj->send(exec, args); } -JSValuePtr jsXMLHttpRequestPrototypeFunctionAbort(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionAbort(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXMLHttpRequest::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXMLHttpRequest::s_info)) return throwError(exec, TypeError); JSXMLHttpRequest* castedThisObj = static_cast<JSXMLHttpRequest*>(asObject(thisValue)); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(castedThisObj->impl()); @@ -333,101 +375,107 @@ JSValuePtr jsXMLHttpRequestPrototypeFunctionAbort(ExecState* exec, JSObject*, JS return jsUndefined(); } -JSValuePtr jsXMLHttpRequestPrototypeFunctionGetAllResponseHeaders(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionGetAllResponseHeaders(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXMLHttpRequest::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXMLHttpRequest::s_info)) return throwError(exec, TypeError); JSXMLHttpRequest* castedThisObj = static_cast<JSXMLHttpRequest*>(asObject(thisValue)); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(castedThisObj->impl()); ExceptionCode ec = 0; - JSC::JSValuePtr result = jsStringOrUndefined(exec, imp->getAllResponseHeaders(ec)); + JSC::JSValue result = jsStringOrUndefined(exec, imp->getAllResponseHeaders(ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsXMLHttpRequestPrototypeFunctionGetResponseHeader(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionGetResponseHeader(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXMLHttpRequest::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXMLHttpRequest::s_info)) return throwError(exec, TypeError); JSXMLHttpRequest* castedThisObj = static_cast<JSXMLHttpRequest*>(asObject(thisValue)); return castedThisObj->getResponseHeader(exec, args); } -JSValuePtr jsXMLHttpRequestPrototypeFunctionOverrideMimeType(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionOverrideMimeType(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXMLHttpRequest::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXMLHttpRequest::s_info)) return throwError(exec, TypeError); JSXMLHttpRequest* castedThisObj = static_cast<JSXMLHttpRequest*>(asObject(thisValue)); return castedThisObj->overrideMimeType(exec, args); } -JSValuePtr jsXMLHttpRequestPrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXMLHttpRequest::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXMLHttpRequest::s_info)) return throwError(exec, TypeError); JSXMLHttpRequest* castedThisObj = static_cast<JSXMLHttpRequest*>(asObject(thisValue)); return castedThisObj->addEventListener(exec, args); } -JSValuePtr jsXMLHttpRequestPrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXMLHttpRequest::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXMLHttpRequest::s_info)) return throwError(exec, TypeError); JSXMLHttpRequest* castedThisObj = static_cast<JSXMLHttpRequest*>(asObject(thisValue)); return castedThisObj->removeEventListener(exec, args); } -JSValuePtr jsXMLHttpRequestPrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXMLHttpRequest::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXMLHttpRequest::s_info)) return throwError(exec, TypeError); JSXMLHttpRequest* castedThisObj = static_cast<JSXMLHttpRequest*>(asObject(thisValue)); XMLHttpRequest* imp = static_cast<XMLHttpRequest*>(castedThisObj->impl()); ExceptionCode ec = 0; - Event* evt = toEvent(args.at(exec, 0)); + Event* evt = toEvent(args.at(0)); - JSC::JSValuePtr result = jsBoolean(imp->dispatchEvent(evt, ec)); + JSC::JSValue result = jsBoolean(imp->dispatchEvent(evt, ec)); setDOMException(exec, ec); return result; } // Constant getters -JSValuePtr jsXMLHttpRequestUNSENT(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXMLHttpRequestUNSENT(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsXMLHttpRequestOPENED(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXMLHttpRequestOPENED(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsXMLHttpRequestHEADERS_RECEIVED(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXMLHttpRequestHEADERS_RECEIVED(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsXMLHttpRequestLOADING(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXMLHttpRequestLOADING(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsXMLHttpRequestDONE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXMLHttpRequestDONE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, XMLHttpRequest* object) +JSC::JSValue toJS(JSC::ExecState* exec, XMLHttpRequest* object) { return getDOMObjectWrapper<JSXMLHttpRequest>(exec, object); } -XMLHttpRequest* toXMLHttpRequest(JSC::JSValuePtr value) +XMLHttpRequest* toXMLHttpRequest(JSC::JSValue value) { - return value->isObject(&JSXMLHttpRequest::s_info) ? static_cast<JSXMLHttpRequest*>(asObject(value))->impl() : 0; + return value.isObject(&JSXMLHttpRequest::s_info) ? static_cast<JSXMLHttpRequest*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.h b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.h index 29be6220cf..9529b0d4b7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.h @@ -34,13 +34,13 @@ class JSXMLHttpRequest : public DOMObject { public: JSXMLHttpRequest(PassRefPtr<JSC::Structure>, PassRefPtr<XMLHttpRequest>); virtual ~JSXMLHttpRequest(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -49,32 +49,33 @@ public: // Custom attributes - JSC::JSValuePtr responseText(JSC::ExecState*) const; + JSC::JSValue responseText(JSC::ExecState*) const; // Custom functions - JSC::JSValuePtr open(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr setRequestHeader(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr send(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr getResponseHeader(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr overrideMimeType(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr addEventListener(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr removeEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue open(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setRequestHeader(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue send(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue getResponseHeader(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue overrideMimeType(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue addEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue removeEventListener(JSC::ExecState*, const JSC::ArgList&); XMLHttpRequest* impl() const { return m_impl.get(); } private: RefPtr<XMLHttpRequest> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, XMLHttpRequest*); -XMLHttpRequest* toXMLHttpRequest(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, XMLHttpRequest*); +XMLHttpRequest* toXMLHttpRequest(JSC::JSValue); class JSXMLHttpRequestPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -83,43 +84,45 @@ public: // Functions -JSC::JSValuePtr jsXMLHttpRequestPrototypeFunctionOpen(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXMLHttpRequestPrototypeFunctionSetRequestHeader(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXMLHttpRequestPrototypeFunctionSend(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXMLHttpRequestPrototypeFunctionAbort(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXMLHttpRequestPrototypeFunctionGetAllResponseHeaders(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXMLHttpRequestPrototypeFunctionGetResponseHeader(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXMLHttpRequestPrototypeFunctionOverrideMimeType(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXMLHttpRequestPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXMLHttpRequestPrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXMLHttpRequestPrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionOpen(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionSetRequestHeader(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionSend(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionAbort(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionGetAllResponseHeaders(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionGetResponseHeader(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionOverrideMimeType(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXMLHttpRequestPrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsXMLHttpRequestOnabort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSXMLHttpRequestOnabort(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsXMLHttpRequestOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSXMLHttpRequestOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsXMLHttpRequestOnload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSXMLHttpRequestOnload(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsXMLHttpRequestOnloadstart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSXMLHttpRequestOnloadstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsXMLHttpRequestOnprogress(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSXMLHttpRequestOnprogress(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsXMLHttpRequestOnreadystatechange(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSXMLHttpRequestOnreadystatechange(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsXMLHttpRequestReadyState(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXMLHttpRequestUpload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXMLHttpRequestResponseText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXMLHttpRequestResponseXML(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXMLHttpRequestStatus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXMLHttpRequestStatusText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestOnabort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSXMLHttpRequestOnabort(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsXMLHttpRequestOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSXMLHttpRequestOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsXMLHttpRequestOnload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSXMLHttpRequestOnload(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsXMLHttpRequestOnloadstart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSXMLHttpRequestOnloadstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsXMLHttpRequestOnprogress(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSXMLHttpRequestOnprogress(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsXMLHttpRequestOnreadystatechange(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSXMLHttpRequestOnreadystatechange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsXMLHttpRequestReadyState(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestWithCredentials(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSXMLHttpRequestWithCredentials(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsXMLHttpRequestUpload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestResponseText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestResponseXML(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestStatus(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestStatusText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsXMLHttpRequestUNSENT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXMLHttpRequestOPENED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXMLHttpRequestHEADERS_RECEIVED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXMLHttpRequestLOADING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXMLHttpRequestDONE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestUNSENT(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestOPENED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestHEADERS_RECEIVED(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestLOADING(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestDONE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestException.cpp b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestException.cpp index 8a669cdcd9..5b3a354199 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestException.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestException.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSXMLHttpRequestException) +ASSERT_CLASS_FITS_IN_CELL(JSXMLHttpRequestException); /* Hash table */ @@ -76,13 +76,13 @@ public: JSXMLHttpRequestExceptionConstructor(ExecState* exec) : DOMObject(JSXMLHttpRequestExceptionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSXMLHttpRequestExceptionPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSXMLHttpRequestExceptionPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -112,19 +112,27 @@ static const HashTable JSXMLHttpRequestExceptionPrototypeTable = { 8, 7, JSXMLHttpRequestExceptionPrototypeTableValues, 0 }; #endif -const ClassInfo JSXMLHttpRequestExceptionPrototype::s_info = { "XMLHttpRequestExceptionPrototype", 0, &JSXMLHttpRequestExceptionPrototypeTable, 0 }; +static const HashTable* getJSXMLHttpRequestExceptionPrototypeTable(ExecState* exec) +{ + return getHashTableForGlobalData(exec->globalData(), &JSXMLHttpRequestExceptionPrototypeTable); +} +const ClassInfo JSXMLHttpRequestExceptionPrototype::s_info = { "XMLHttpRequestExceptionPrototype", 0, 0, getJSXMLHttpRequestExceptionPrototypeTable }; -JSObject* JSXMLHttpRequestExceptionPrototype::self(ExecState* exec) +JSObject* JSXMLHttpRequestExceptionPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSXMLHttpRequestException>(exec); + return getDOMPrototype<JSXMLHttpRequestException>(exec, globalObject); } bool JSXMLHttpRequestExceptionPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { - return getStaticPropertySlot<JSXMLHttpRequestExceptionPrototype, JSObject>(exec, &JSXMLHttpRequestExceptionPrototypeTable, this, propertyName, slot); + return getStaticPropertySlot<JSXMLHttpRequestExceptionPrototype, JSObject>(exec, getJSXMLHttpRequestExceptionPrototypeTable(exec), this, propertyName, slot); } -const ClassInfo JSXMLHttpRequestException::s_info = { "XMLHttpRequestException", 0, &JSXMLHttpRequestExceptionTable, 0 }; +static const HashTable* getJSXMLHttpRequestExceptionTable(ExecState* exec) +{ + return getHashTableForGlobalData(exec->globalData(), &JSXMLHttpRequestExceptionTable); +} +const ClassInfo JSXMLHttpRequestException::s_info = { "XMLHttpRequestException", 0, 0, getJSXMLHttpRequestExceptionTable }; JSXMLHttpRequestException::JSXMLHttpRequestException(PassRefPtr<Structure> structure, PassRefPtr<XMLHttpRequestException> impl) : DOMObject(structure) @@ -135,77 +143,80 @@ JSXMLHttpRequestException::JSXMLHttpRequestException(PassRefPtr<Structure> struc JSXMLHttpRequestException::~JSXMLHttpRequestException() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSXMLHttpRequestException::createPrototype(ExecState* exec) +JSObject* JSXMLHttpRequestException::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSXMLHttpRequestExceptionPrototype(JSXMLHttpRequestExceptionPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSXMLHttpRequestExceptionPrototype(JSXMLHttpRequestExceptionPrototype::createStructure(globalObject->objectPrototype())); } bool JSXMLHttpRequestException::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { - return getStaticValueSlot<JSXMLHttpRequestException, Base>(exec, &JSXMLHttpRequestExceptionTable, this, propertyName, slot); + return getStaticValueSlot<JSXMLHttpRequestException, Base>(exec, getJSXMLHttpRequestExceptionTable(exec), this, propertyName, slot); } -JSValuePtr jsXMLHttpRequestExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequestException* imp = static_cast<XMLHttpRequestException*>(static_cast<JSXMLHttpRequestException*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->code()); } -JSValuePtr jsXMLHttpRequestExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequestException* imp = static_cast<XMLHttpRequestException*>(static_cast<JSXMLHttpRequestException*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsXMLHttpRequestExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequestException* imp = static_cast<XMLHttpRequestException*>(static_cast<JSXMLHttpRequestException*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->message()); } -JSValuePtr jsXMLHttpRequestExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSXMLHttpRequestException*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSXMLHttpRequestException::getConstructor(ExecState* exec) +JSValue JSXMLHttpRequestException::getConstructor(ExecState* exec) { return getDOMConstructor<JSXMLHttpRequestExceptionConstructor>(exec); } -JSValuePtr jsXMLHttpRequestExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXMLHttpRequestExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXMLHttpRequestException::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXMLHttpRequestException::s_info)) return throwError(exec, TypeError); JSXMLHttpRequestException* castedThisObj = static_cast<JSXMLHttpRequestException*>(asObject(thisValue)); XMLHttpRequestException* imp = static_cast<XMLHttpRequestException*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsString(exec, imp->toString()); + JSC::JSValue result = jsString(exec, imp->toString()); return result; } // Constant getters -JSValuePtr jsXMLHttpRequestExceptionNETWORK_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXMLHttpRequestExceptionNETWORK_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(101)); } -JSValuePtr jsXMLHttpRequestExceptionABORT_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXMLHttpRequestExceptionABORT_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(102)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, XMLHttpRequestException* object) +JSC::JSValue toJS(JSC::ExecState* exec, XMLHttpRequestException* object) { return getDOMObjectWrapper<JSXMLHttpRequestException>(exec, object); } -XMLHttpRequestException* toXMLHttpRequestException(JSC::JSValuePtr value) +XMLHttpRequestException* toXMLHttpRequestException(JSC::JSValue value) { - return value->isObject(&JSXMLHttpRequestException::s_info) ? static_cast<JSXMLHttpRequestException*>(asObject(value))->impl() : 0; + return value.isObject(&JSXMLHttpRequestException::s_info) ? static_cast<JSXMLHttpRequestException*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestException.h b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestException.h index 5c4443e0aa..52f26bfeb2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestException.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestException.h @@ -34,33 +34,34 @@ class JSXMLHttpRequestException : public DOMObject { public: JSXMLHttpRequestException(PassRefPtr<JSC::Structure>, PassRefPtr<XMLHttpRequestException>); virtual ~JSXMLHttpRequestException(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); XMLHttpRequestException* impl() const { return m_impl.get(); } private: RefPtr<XMLHttpRequestException> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, XMLHttpRequestException*); -XMLHttpRequestException* toXMLHttpRequestException(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, XMLHttpRequestException*); +XMLHttpRequestException* toXMLHttpRequestException(JSC::JSValue); class JSXMLHttpRequestExceptionPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -69,17 +70,17 @@ public: // Functions -JSC::JSValuePtr jsXMLHttpRequestExceptionPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXMLHttpRequestExceptionPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsXMLHttpRequestExceptionCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXMLHttpRequestExceptionName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXMLHttpRequestExceptionMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXMLHttpRequestExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestExceptionCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestExceptionName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestExceptionMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsXMLHttpRequestExceptionNETWORK_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXMLHttpRequestExceptionABORT_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestExceptionNETWORK_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestExceptionABORT_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestProgressEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestProgressEvent.cpp index 2df3a902a9..57460b9995 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestProgressEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestProgressEvent.cpp @@ -32,7 +32,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSXMLHttpRequestProgressEvent) +ASSERT_CLASS_FITS_IN_CELL(JSXMLHttpRequestProgressEvent); /* Hash table */ @@ -70,13 +70,13 @@ public: JSXMLHttpRequestProgressEventConstructor(ExecState* exec) : DOMObject(JSXMLHttpRequestProgressEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSXMLHttpRequestProgressEventPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSXMLHttpRequestProgressEventPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -103,47 +103,57 @@ static const HashTable JSXMLHttpRequestProgressEventPrototypeTable = { 1, 0, JSXMLHttpRequestProgressEventPrototypeTableValues, 0 }; #endif -const ClassInfo JSXMLHttpRequestProgressEventPrototype::s_info = { "XMLHttpRequestProgressEventPrototype", 0, &JSXMLHttpRequestProgressEventPrototypeTable, 0 }; +static const HashTable* getJSXMLHttpRequestProgressEventPrototypeTable(ExecState* exec) +{ + return getHashTableForGlobalData(exec->globalData(), &JSXMLHttpRequestProgressEventPrototypeTable); +} +const ClassInfo JSXMLHttpRequestProgressEventPrototype::s_info = { "XMLHttpRequestProgressEventPrototype", 0, 0, getJSXMLHttpRequestProgressEventPrototypeTable }; -JSObject* JSXMLHttpRequestProgressEventPrototype::self(ExecState* exec) +JSObject* JSXMLHttpRequestProgressEventPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSXMLHttpRequestProgressEvent>(exec); + return getDOMPrototype<JSXMLHttpRequestProgressEvent>(exec, globalObject); } -const ClassInfo JSXMLHttpRequestProgressEvent::s_info = { "XMLHttpRequestProgressEvent", &JSProgressEvent::s_info, &JSXMLHttpRequestProgressEventTable, 0 }; +static const HashTable* getJSXMLHttpRequestProgressEventTable(ExecState* exec) +{ + return getHashTableForGlobalData(exec->globalData(), &JSXMLHttpRequestProgressEventTable); +} +const ClassInfo JSXMLHttpRequestProgressEvent::s_info = { "XMLHttpRequestProgressEvent", &JSProgressEvent::s_info, 0, getJSXMLHttpRequestProgressEventTable }; JSXMLHttpRequestProgressEvent::JSXMLHttpRequestProgressEvent(PassRefPtr<Structure> structure, PassRefPtr<XMLHttpRequestProgressEvent> impl) : JSProgressEvent(structure, impl) { } -JSObject* JSXMLHttpRequestProgressEvent::createPrototype(ExecState* exec) +JSObject* JSXMLHttpRequestProgressEvent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSXMLHttpRequestProgressEventPrototype(JSXMLHttpRequestProgressEventPrototype::createStructure(JSProgressEventPrototype::self(exec))); + return new (exec) JSXMLHttpRequestProgressEventPrototype(JSXMLHttpRequestProgressEventPrototype::createStructure(JSProgressEventPrototype::self(exec, globalObject))); } bool JSXMLHttpRequestProgressEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { - return getStaticValueSlot<JSXMLHttpRequestProgressEvent, Base>(exec, &JSXMLHttpRequestProgressEventTable, this, propertyName, slot); + return getStaticValueSlot<JSXMLHttpRequestProgressEvent, Base>(exec, getJSXMLHttpRequestProgressEventTable(exec), this, propertyName, slot); } -JSValuePtr jsXMLHttpRequestProgressEventPosition(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestProgressEventPosition(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequestProgressEvent* imp = static_cast<XMLHttpRequestProgressEvent*>(static_cast<JSXMLHttpRequestProgressEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->position()); } -JSValuePtr jsXMLHttpRequestProgressEventTotalSize(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestProgressEventTotalSize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequestProgressEvent* imp = static_cast<XMLHttpRequestProgressEvent*>(static_cast<JSXMLHttpRequestProgressEvent*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->totalSize()); } -JSValuePtr jsXMLHttpRequestProgressEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestProgressEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSXMLHttpRequestProgressEvent*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSXMLHttpRequestProgressEvent::getConstructor(ExecState* exec) +JSValue JSXMLHttpRequestProgressEvent::getConstructor(ExecState* exec) { return getDOMConstructor<JSXMLHttpRequestProgressEventConstructor>(exec); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestProgressEvent.h b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestProgressEvent.h index 6cd548c755..45ce6103ff 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestProgressEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestProgressEvent.h @@ -31,23 +31,24 @@ class JSXMLHttpRequestProgressEvent : public JSProgressEvent { typedef JSProgressEvent Base; public: JSXMLHttpRequestProgressEvent(PassRefPtr<JSC::Structure>, PassRefPtr<XMLHttpRequestProgressEvent>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); }; class JSXMLHttpRequestProgressEventPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; JSXMLHttpRequestProgressEventPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } @@ -55,9 +56,9 @@ public: // Attributes -JSC::JSValuePtr jsXMLHttpRequestProgressEventPosition(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXMLHttpRequestProgressEventTotalSize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXMLHttpRequestProgressEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestProgressEventPosition(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestProgressEventTotalSize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestProgressEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestUpload.cpp b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestUpload.cpp index fa98106f8d..bcf0d7cf47 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestUpload.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestUpload.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSXMLHttpRequestUpload) +ASSERT_CLASS_FITS_IN_CELL(JSXMLHttpRequestUpload); /* Hash table */ @@ -80,13 +80,13 @@ public: JSXMLHttpRequestUploadConstructor(ExecState* exec) : DOMObject(JSXMLHttpRequestUploadConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSXMLHttpRequestUploadPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSXMLHttpRequestUploadPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -116,19 +116,27 @@ static const HashTable JSXMLHttpRequestUploadPrototypeTable = { 8, 7, JSXMLHttpRequestUploadPrototypeTableValues, 0 }; #endif -const ClassInfo JSXMLHttpRequestUploadPrototype::s_info = { "XMLHttpRequestUploadPrototype", 0, &JSXMLHttpRequestUploadPrototypeTable, 0 }; +static const HashTable* getJSXMLHttpRequestUploadPrototypeTable(ExecState* exec) +{ + return getHashTableForGlobalData(exec->globalData(), &JSXMLHttpRequestUploadPrototypeTable); +} +const ClassInfo JSXMLHttpRequestUploadPrototype::s_info = { "XMLHttpRequestUploadPrototype", 0, 0, getJSXMLHttpRequestUploadPrototypeTable }; -JSObject* JSXMLHttpRequestUploadPrototype::self(ExecState* exec) +JSObject* JSXMLHttpRequestUploadPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSXMLHttpRequestUpload>(exec); + return getDOMPrototype<JSXMLHttpRequestUpload>(exec, globalObject); } bool JSXMLHttpRequestUploadPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { - return getStaticFunctionSlot<JSObject>(exec, &JSXMLHttpRequestUploadPrototypeTable, this, propertyName, slot); + return getStaticFunctionSlot<JSObject>(exec, getJSXMLHttpRequestUploadPrototypeTable(exec), this, propertyName, slot); } -const ClassInfo JSXMLHttpRequestUpload::s_info = { "XMLHttpRequestUpload", 0, &JSXMLHttpRequestUploadTable, 0 }; +static const HashTable* getJSXMLHttpRequestUploadTable(ExecState* exec) +{ + return getHashTableForGlobalData(exec->globalData(), &JSXMLHttpRequestUploadTable); +} +const ClassInfo JSXMLHttpRequestUpload::s_info = { "XMLHttpRequestUpload", 0, 0, getJSXMLHttpRequestUploadTable }; JSXMLHttpRequestUpload::JSXMLHttpRequestUpload(PassRefPtr<Structure> structure, PassRefPtr<XMLHttpRequestUpload> impl) : DOMObject(structure) @@ -139,166 +147,178 @@ JSXMLHttpRequestUpload::JSXMLHttpRequestUpload(PassRefPtr<Structure> structure, JSXMLHttpRequestUpload::~JSXMLHttpRequestUpload() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSXMLHttpRequestUpload::createPrototype(ExecState* exec) +JSObject* JSXMLHttpRequestUpload::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSXMLHttpRequestUploadPrototype(JSXMLHttpRequestUploadPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSXMLHttpRequestUploadPrototype(JSXMLHttpRequestUploadPrototype::createStructure(globalObject->objectPrototype())); } bool JSXMLHttpRequestUpload::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { - return getStaticValueSlot<JSXMLHttpRequestUpload, Base>(exec, &JSXMLHttpRequestUploadTable, this, propertyName, slot); + return getStaticValueSlot<JSXMLHttpRequestUpload, Base>(exec, getJSXMLHttpRequestUploadTable(exec), this, propertyName, slot); } -JSValuePtr jsXMLHttpRequestUploadOnabort(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestUploadOnabort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequestUpload* imp = static_cast<XMLHttpRequestUpload*>(static_cast<JSXMLHttpRequestUpload*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onabort())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onabort()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsXMLHttpRequestUploadOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestUploadOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequestUpload* imp = static_cast<XMLHttpRequestUpload*>(static_cast<JSXMLHttpRequestUpload*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onerror())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onerror()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsXMLHttpRequestUploadOnload(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestUploadOnload(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequestUpload* imp = static_cast<XMLHttpRequestUpload*>(static_cast<JSXMLHttpRequestUpload*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onload())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onload()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsXMLHttpRequestUploadOnloadstart(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestUploadOnloadstart(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequestUpload* imp = static_cast<XMLHttpRequestUpload*>(static_cast<JSXMLHttpRequestUpload*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onloadstart())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onloadstart()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsXMLHttpRequestUploadOnprogress(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestUploadOnprogress(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XMLHttpRequestUpload* imp = static_cast<XMLHttpRequestUpload*>(static_cast<JSXMLHttpRequestUpload*>(asObject(slot.slotBase()))->impl()); - if (JSUnprotectedEventListener* listener = static_cast<JSUnprotectedEventListener*>(imp->onprogress())) { - if (JSObject* listenerObj = listener->listenerObj()) - return listenerObj; + if (EventListener* listener = imp->onprogress()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; } return jsNull(); } -JSValuePtr jsXMLHttpRequestUploadConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLHttpRequestUploadConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSXMLHttpRequestUpload*>(asObject(slot.slotBase()))->getConstructor(exec); } -void JSXMLHttpRequestUpload::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot) +void JSXMLHttpRequestUpload::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { - lookupPut<JSXMLHttpRequestUpload, Base>(exec, propertyName, value, &JSXMLHttpRequestUploadTable, this, slot); + lookupPut<JSXMLHttpRequestUpload, Base>(exec, propertyName, value, getJSXMLHttpRequestUploadTable(exec), this, slot); } -void setJSXMLHttpRequestUploadOnabort(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSXMLHttpRequestUploadOnabort(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); XMLHttpRequestUpload* imp = static_cast<XMLHttpRequestUpload*>(static_cast<JSXMLHttpRequestUpload*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnabort(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnabort(globalObject->createJSAttributeEventListener(value)); } -void setJSXMLHttpRequestUploadOnerror(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSXMLHttpRequestUploadOnerror(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); XMLHttpRequestUpload* imp = static_cast<XMLHttpRequestUpload*>(static_cast<JSXMLHttpRequestUpload*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnerror(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnerror(globalObject->createJSAttributeEventListener(value)); } -void setJSXMLHttpRequestUploadOnload(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSXMLHttpRequestUploadOnload(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); XMLHttpRequestUpload* imp = static_cast<XMLHttpRequestUpload*>(static_cast<JSXMLHttpRequestUpload*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnload(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnload(globalObject->createJSAttributeEventListener(value)); } -void setJSXMLHttpRequestUploadOnloadstart(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSXMLHttpRequestUploadOnloadstart(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); XMLHttpRequestUpload* imp = static_cast<XMLHttpRequestUpload*>(static_cast<JSXMLHttpRequestUpload*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnloadstart(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnloadstart(globalObject->createJSAttributeEventListener(value)); } -void setJSXMLHttpRequestUploadOnprogress(ExecState* exec, JSObject* thisObject, JSValuePtr value) +void setJSXMLHttpRequestUploadOnprogress(ExecState* exec, JSObject* thisObject, JSValue value) { + UNUSED_PARAM(exec); XMLHttpRequestUpload* imp = static_cast<XMLHttpRequestUpload*>(static_cast<JSXMLHttpRequestUpload*>(thisObject)->impl()); JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); if (!globalObject) return; - imp->setOnprogress(globalObject->findOrCreateJSUnprotectedEventListener(exec, value, true)); + imp->setOnprogress(globalObject->createJSAttributeEventListener(value)); } -JSValuePtr JSXMLHttpRequestUpload::getConstructor(ExecState* exec) +JSValue JSXMLHttpRequestUpload::getConstructor(ExecState* exec) { return getDOMConstructor<JSXMLHttpRequestUploadConstructor>(exec); } -JSValuePtr jsXMLHttpRequestUploadPrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXMLHttpRequestUploadPrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXMLHttpRequestUpload::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXMLHttpRequestUpload::s_info)) return throwError(exec, TypeError); JSXMLHttpRequestUpload* castedThisObj = static_cast<JSXMLHttpRequestUpload*>(asObject(thisValue)); return castedThisObj->addEventListener(exec, args); } -JSValuePtr jsXMLHttpRequestUploadPrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXMLHttpRequestUploadPrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXMLHttpRequestUpload::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXMLHttpRequestUpload::s_info)) return throwError(exec, TypeError); JSXMLHttpRequestUpload* castedThisObj = static_cast<JSXMLHttpRequestUpload*>(asObject(thisValue)); return castedThisObj->removeEventListener(exec, args); } -JSValuePtr jsXMLHttpRequestUploadPrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXMLHttpRequestUploadPrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXMLHttpRequestUpload::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXMLHttpRequestUpload::s_info)) return throwError(exec, TypeError); JSXMLHttpRequestUpload* castedThisObj = static_cast<JSXMLHttpRequestUpload*>(asObject(thisValue)); XMLHttpRequestUpload* imp = static_cast<XMLHttpRequestUpload*>(castedThisObj->impl()); ExceptionCode ec = 0; - Event* evt = toEvent(args.at(exec, 0)); + Event* evt = toEvent(args.at(0)); - JSC::JSValuePtr result = jsBoolean(imp->dispatchEvent(evt, ec)); + JSC::JSValue result = jsBoolean(imp->dispatchEvent(evt, ec)); setDOMException(exec, ec); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, XMLHttpRequestUpload* object) +JSC::JSValue toJS(JSC::ExecState* exec, XMLHttpRequestUpload* object) { return getDOMObjectWrapper<JSXMLHttpRequestUpload>(exec, object); } -XMLHttpRequestUpload* toXMLHttpRequestUpload(JSC::JSValuePtr value) +XMLHttpRequestUpload* toXMLHttpRequestUpload(JSC::JSValue value) { - return value->isObject(&JSXMLHttpRequestUpload::s_info) ? static_cast<JSXMLHttpRequestUpload*>(asObject(value))->impl() : 0; + return value.isObject(&JSXMLHttpRequestUpload::s_info) ? static_cast<JSXMLHttpRequestUpload*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestUpload.h b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestUpload.h index af0f1eb462..ed0313e875 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestUpload.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestUpload.h @@ -34,40 +34,41 @@ class JSXMLHttpRequestUpload : public DOMObject { public: JSXMLHttpRequestUpload(PassRefPtr<JSC::Structure>, PassRefPtr<XMLHttpRequestUpload>); virtual ~JSXMLHttpRequestUpload(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } virtual void mark(); - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); // Custom functions - JSC::JSValuePtr addEventListener(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr removeEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue addEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue removeEventListener(JSC::ExecState*, const JSC::ArgList&); XMLHttpRequestUpload* impl() const { return m_impl.get(); } private: RefPtr<XMLHttpRequestUpload> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, XMLHttpRequestUpload*); -XMLHttpRequestUpload* toXMLHttpRequestUpload(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, XMLHttpRequestUpload*); +XMLHttpRequestUpload* toXMLHttpRequestUpload(JSC::JSValue); class JSXMLHttpRequestUploadPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -76,22 +77,22 @@ public: // Functions -JSC::JSValuePtr jsXMLHttpRequestUploadPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXMLHttpRequestUploadPrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXMLHttpRequestUploadPrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXMLHttpRequestUploadPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXMLHttpRequestUploadPrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXMLHttpRequestUploadPrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsXMLHttpRequestUploadOnabort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSXMLHttpRequestUploadOnabort(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsXMLHttpRequestUploadOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSXMLHttpRequestUploadOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsXMLHttpRequestUploadOnload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSXMLHttpRequestUploadOnload(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsXMLHttpRequestUploadOnloadstart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSXMLHttpRequestUploadOnloadstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsXMLHttpRequestUploadOnprogress(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSXMLHttpRequestUploadOnprogress(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr); -JSC::JSValuePtr jsXMLHttpRequestUploadConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLHttpRequestUploadOnabort(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSXMLHttpRequestUploadOnabort(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsXMLHttpRequestUploadOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSXMLHttpRequestUploadOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsXMLHttpRequestUploadOnload(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSXMLHttpRequestUploadOnload(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsXMLHttpRequestUploadOnloadstart(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSXMLHttpRequestUploadOnloadstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsXMLHttpRequestUploadOnprogress(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSXMLHttpRequestUploadOnprogress(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsXMLHttpRequestUploadConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLSerializer.cpp b/src/3rdparty/webkit/WebCore/generated/JSXMLSerializer.cpp index 4b2b3e8282..bb7e1c36ad 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLSerializer.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLSerializer.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSXMLSerializer) +ASSERT_CLASS_FITS_IN_CELL(JSXMLSerializer); /* Hash table */ @@ -72,13 +72,13 @@ public: JSXMLSerializerConstructor(ExecState* exec) : DOMObject(JSXMLSerializerConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSXMLSerializerPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSXMLSerializerPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -117,9 +117,9 @@ static const HashTable JSXMLSerializerPrototypeTable = const ClassInfo JSXMLSerializerPrototype::s_info = { "XMLSerializerPrototype", 0, &JSXMLSerializerPrototypeTable, 0 }; -JSObject* JSXMLSerializerPrototype::self(ExecState* exec) +JSObject* JSXMLSerializerPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSXMLSerializer>(exec); + return getDOMPrototype<JSXMLSerializer>(exec, globalObject); } bool JSXMLSerializerPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -138,12 +138,11 @@ JSXMLSerializer::JSXMLSerializer(PassRefPtr<Structure> structure, PassRefPtr<XML JSXMLSerializer::~JSXMLSerializer() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSXMLSerializer::createPrototype(ExecState* exec) +JSObject* JSXMLSerializer::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSXMLSerializerPrototype(JSXMLSerializerPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSXMLSerializerPrototype(JSXMLSerializerPrototype::createStructure(globalObject->objectPrototype())); } bool JSXMLSerializer::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -151,37 +150,38 @@ bool JSXMLSerializer::getOwnPropertySlot(ExecState* exec, const Identifier& prop return getStaticValueSlot<JSXMLSerializer, Base>(exec, &JSXMLSerializerTable, this, propertyName, slot); } -JSValuePtr jsXMLSerializerConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXMLSerializerConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSXMLSerializer*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSXMLSerializer::getConstructor(ExecState* exec) +JSValue JSXMLSerializer::getConstructor(ExecState* exec) { return getDOMConstructor<JSXMLSerializerConstructor>(exec); } -JSValuePtr jsXMLSerializerPrototypeFunctionSerializeToString(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXMLSerializerPrototypeFunctionSerializeToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXMLSerializer::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXMLSerializer::s_info)) return throwError(exec, TypeError); JSXMLSerializer* castedThisObj = static_cast<JSXMLSerializer*>(asObject(thisValue)); XMLSerializer* imp = static_cast<XMLSerializer*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* node = toNode(args.at(exec, 0)); + Node* node = toNode(args.at(0)); - JSC::JSValuePtr result = jsString(exec, imp->serializeToString(node, ec)); + JSC::JSValue result = jsString(exec, imp->serializeToString(node, ec)); setDOMException(exec, ec); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, XMLSerializer* object) +JSC::JSValue toJS(JSC::ExecState* exec, XMLSerializer* object) { return getDOMObjectWrapper<JSXMLSerializer>(exec, object); } -XMLSerializer* toXMLSerializer(JSC::JSValuePtr value) +XMLSerializer* toXMLSerializer(JSC::JSValue value) { - return value->isObject(&JSXMLSerializer::s_info) ? static_cast<JSXMLSerializer*>(asObject(value))->impl() : 0; + return value.isObject(&JSXMLSerializer::s_info) ? static_cast<JSXMLSerializer*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLSerializer.h b/src/3rdparty/webkit/WebCore/generated/JSXMLSerializer.h index c8c72a6795..c9734554e4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLSerializer.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLSerializer.h @@ -34,33 +34,34 @@ class JSXMLSerializer : public DOMObject { public: JSXMLSerializer(PassRefPtr<JSC::Structure>, PassRefPtr<XMLSerializer>); virtual ~JSXMLSerializer(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); XMLSerializer* impl() const { return m_impl.get(); } private: RefPtr<XMLSerializer> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, XMLSerializer*); -XMLSerializer* toXMLSerializer(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, XMLSerializer*); +XMLSerializer* toXMLSerializer(JSC::JSValue); class JSXMLSerializerPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -69,10 +70,10 @@ public: // Functions -JSC::JSValuePtr jsXMLSerializerPrototypeFunctionSerializeToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXMLSerializerPrototypeFunctionSerializeToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsXMLSerializerConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXMLSerializerConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathEvaluator.cpp b/src/3rdparty/webkit/WebCore/generated/JSXPathEvaluator.cpp index 7db5109cca..6ddeeeabbb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathEvaluator.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathEvaluator.cpp @@ -45,7 +45,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSXPathEvaluator) +ASSERT_CLASS_FITS_IN_CELL(JSXPathEvaluator); /* Hash table */ @@ -81,13 +81,13 @@ public: JSXPathEvaluatorConstructor(ExecState* exec) : DOMObject(JSXPathEvaluatorConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSXPathEvaluatorPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSXPathEvaluatorPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -128,9 +128,9 @@ static const HashTable JSXPathEvaluatorPrototypeTable = const ClassInfo JSXPathEvaluatorPrototype::s_info = { "XPathEvaluatorPrototype", 0, &JSXPathEvaluatorPrototypeTable, 0 }; -JSObject* JSXPathEvaluatorPrototype::self(ExecState* exec) +JSObject* JSXPathEvaluatorPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSXPathEvaluator>(exec); + return getDOMPrototype<JSXPathEvaluator>(exec, globalObject); } bool JSXPathEvaluatorPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -149,12 +149,11 @@ JSXPathEvaluator::JSXPathEvaluator(PassRefPtr<Structure> structure, PassRefPtr<X JSXPathEvaluator::~JSXPathEvaluator() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSXPathEvaluator::createPrototype(ExecState* exec) +JSObject* JSXPathEvaluator::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSXPathEvaluatorPrototype(JSXPathEvaluatorPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSXPathEvaluatorPrototype(JSXPathEvaluatorPrototype::createStructure(globalObject->objectPrototype())); } bool JSXPathEvaluator::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -162,84 +161,87 @@ bool JSXPathEvaluator::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSXPathEvaluator, Base>(exec, &JSXPathEvaluatorTable, this, propertyName, slot); } -JSValuePtr jsXPathEvaluatorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXPathEvaluatorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSXPathEvaluator*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSXPathEvaluator::getConstructor(ExecState* exec) +JSValue JSXPathEvaluator::getConstructor(ExecState* exec) { return getDOMConstructor<JSXPathEvaluatorConstructor>(exec); } -JSValuePtr jsXPathEvaluatorPrototypeFunctionCreateExpression(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXPathEvaluatorPrototypeFunctionCreateExpression(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXPathEvaluator::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXPathEvaluator::s_info)) return throwError(exec, TypeError); JSXPathEvaluator* castedThisObj = static_cast<JSXPathEvaluator*>(asObject(thisValue)); XPathEvaluator* imp = static_cast<XPathEvaluator*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& expression = args.at(exec, 0)->toString(exec); + const UString& expression = args.at(0).toString(exec); RefPtr<XPathNSResolver> customResolver; - XPathNSResolver* resolver = toXPathNSResolver(args.at(exec, 1)); + XPathNSResolver* resolver = toXPathNSResolver(args.at(1)); if (!resolver) { - customResolver = JSCustomXPathNSResolver::create(exec, args.at(exec, 1)); + customResolver = JSCustomXPathNSResolver::create(exec, args.at(1)); if (exec->hadException()) return jsUndefined(); resolver = customResolver.get(); } - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createExpression(expression, resolver, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createExpression(expression, resolver, ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsXPathEvaluatorPrototypeFunctionCreateNSResolver(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXPathEvaluatorPrototypeFunctionCreateNSResolver(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXPathEvaluator::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXPathEvaluator::s_info)) return throwError(exec, TypeError); JSXPathEvaluator* castedThisObj = static_cast<JSXPathEvaluator*>(asObject(thisValue)); XPathEvaluator* imp = static_cast<XPathEvaluator*>(castedThisObj->impl()); - Node* nodeResolver = toNode(args.at(exec, 0)); + Node* nodeResolver = toNode(args.at(0)); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->createNSResolver(nodeResolver))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createNSResolver(nodeResolver))); return result; } -JSValuePtr jsXPathEvaluatorPrototypeFunctionEvaluate(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXPathEvaluatorPrototypeFunctionEvaluate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXPathEvaluator::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXPathEvaluator::s_info)) return throwError(exec, TypeError); JSXPathEvaluator* castedThisObj = static_cast<JSXPathEvaluator*>(asObject(thisValue)); XPathEvaluator* imp = static_cast<XPathEvaluator*>(castedThisObj->impl()); ExceptionCode ec = 0; - const UString& expression = args.at(exec, 0)->toString(exec); - Node* contextNode = toNode(args.at(exec, 1)); + const UString& expression = args.at(0).toString(exec); + Node* contextNode = toNode(args.at(1)); RefPtr<XPathNSResolver> customResolver; - XPathNSResolver* resolver = toXPathNSResolver(args.at(exec, 2)); + XPathNSResolver* resolver = toXPathNSResolver(args.at(2)); if (!resolver) { - customResolver = JSCustomXPathNSResolver::create(exec, args.at(exec, 2)); + customResolver = JSCustomXPathNSResolver::create(exec, args.at(2)); if (exec->hadException()) return jsUndefined(); resolver = customResolver.get(); } - unsigned short type = args.at(exec, 3)->toInt32(exec); - XPathResult* inResult = toXPathResult(args.at(exec, 4)); + unsigned short type = args.at(3).toInt32(exec); + XPathResult* inResult = toXPathResult(args.at(4)); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->evaluate(expression, contextNode, resolver, type, inResult, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->evaluate(expression, contextNode, resolver, type, inResult, ec))); setDOMException(exec, ec); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, XPathEvaluator* object) +JSC::JSValue toJS(JSC::ExecState* exec, XPathEvaluator* object) { return getDOMObjectWrapper<JSXPathEvaluator>(exec, object); } -XPathEvaluator* toXPathEvaluator(JSC::JSValuePtr value) +XPathEvaluator* toXPathEvaluator(JSC::JSValue value) { - return value->isObject(&JSXPathEvaluator::s_info) ? static_cast<JSXPathEvaluator*>(asObject(value))->impl() : 0; + return value.isObject(&JSXPathEvaluator::s_info) ? static_cast<JSXPathEvaluator*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathEvaluator.h b/src/3rdparty/webkit/WebCore/generated/JSXPathEvaluator.h index 6f9cd7256e..3adb44075a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathEvaluator.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathEvaluator.h @@ -37,33 +37,34 @@ class JSXPathEvaluator : public DOMObject { public: JSXPathEvaluator(PassRefPtr<JSC::Structure>, PassRefPtr<XPathEvaluator>); virtual ~JSXPathEvaluator(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); XPathEvaluator* impl() const { return m_impl.get(); } private: RefPtr<XPathEvaluator> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, XPathEvaluator*); -XPathEvaluator* toXPathEvaluator(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, XPathEvaluator*); +XPathEvaluator* toXPathEvaluator(JSC::JSValue); class JSXPathEvaluatorPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -72,12 +73,12 @@ public: // Functions -JSC::JSValuePtr jsXPathEvaluatorPrototypeFunctionCreateExpression(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXPathEvaluatorPrototypeFunctionCreateNSResolver(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXPathEvaluatorPrototypeFunctionEvaluate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXPathEvaluatorPrototypeFunctionCreateExpression(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXPathEvaluatorPrototypeFunctionCreateNSResolver(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXPathEvaluatorPrototypeFunctionEvaluate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsXPathEvaluatorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathEvaluatorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathException.cpp b/src/3rdparty/webkit/WebCore/generated/JSXPathException.cpp index 8b2ab42ff0..ebcce7fbfa 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathException.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathException.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSXPathException) +ASSERT_CLASS_FITS_IN_CELL(JSXPathException); /* Hash table */ @@ -79,13 +79,13 @@ public: JSXPathExceptionConstructor(ExecState* exec) : DOMObject(JSXPathExceptionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSXPathExceptionPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSXPathExceptionPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -117,9 +117,9 @@ static const HashTable JSXPathExceptionPrototypeTable = const ClassInfo JSXPathExceptionPrototype::s_info = { "XPathExceptionPrototype", 0, &JSXPathExceptionPrototypeTable, 0 }; -JSObject* JSXPathExceptionPrototype::self(ExecState* exec) +JSObject* JSXPathExceptionPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSXPathException>(exec); + return getDOMPrototype<JSXPathException>(exec, globalObject); } bool JSXPathExceptionPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -138,12 +138,11 @@ JSXPathException::JSXPathException(PassRefPtr<Structure> structure, PassRefPtr<X JSXPathException::~JSXPathException() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSXPathException::createPrototype(ExecState* exec) +JSObject* JSXPathException::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSXPathExceptionPrototype(JSXPathExceptionPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSXPathExceptionPrototype(JSXPathExceptionPrototype::createStructure(globalObject->objectPrototype())); } bool JSXPathException::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -151,64 +150,68 @@ bool JSXPathException::getOwnPropertySlot(ExecState* exec, const Identifier& pro return getStaticValueSlot<JSXPathException, Base>(exec, &JSXPathExceptionTable, this, propertyName, slot); } -JSValuePtr jsXPathExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXPathExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XPathException* imp = static_cast<XPathException*>(static_cast<JSXPathException*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->code()); } -JSValuePtr jsXPathExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXPathExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XPathException* imp = static_cast<XPathException*>(static_cast<JSXPathException*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->name()); } -JSValuePtr jsXPathExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXPathExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XPathException* imp = static_cast<XPathException*>(static_cast<JSXPathException*>(asObject(slot.slotBase()))->impl()); return jsString(exec, imp->message()); } -JSValuePtr jsXPathExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXPathExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSXPathException*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSXPathException::getConstructor(ExecState* exec) +JSValue JSXPathException::getConstructor(ExecState* exec) { return getDOMConstructor<JSXPathExceptionConstructor>(exec); } -JSValuePtr jsXPathExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXPathExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXPathException::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXPathException::s_info)) return throwError(exec, TypeError); JSXPathException* castedThisObj = static_cast<JSXPathException*>(asObject(thisValue)); XPathException* imp = static_cast<XPathException*>(castedThisObj->impl()); - JSC::JSValuePtr result = jsString(exec, imp->toString()); + JSC::JSValue result = jsString(exec, imp->toString()); return result; } // Constant getters -JSValuePtr jsXPathExceptionINVALID_EXPRESSION_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXPathExceptionINVALID_EXPRESSION_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(51)); } -JSValuePtr jsXPathExceptionTYPE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXPathExceptionTYPE_ERR(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(52)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, XPathException* object) +JSC::JSValue toJS(JSC::ExecState* exec, XPathException* object) { return getDOMObjectWrapper<JSXPathException>(exec, object); } -XPathException* toXPathException(JSC::JSValuePtr value) +XPathException* toXPathException(JSC::JSValue value) { - return value->isObject(&JSXPathException::s_info) ? static_cast<JSXPathException*>(asObject(value))->impl() : 0; + return value.isObject(&JSXPathException::s_info) ? static_cast<JSXPathException*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathException.h b/src/3rdparty/webkit/WebCore/generated/JSXPathException.h index 53b1874a8d..f66433c352 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathException.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathException.h @@ -37,33 +37,34 @@ class JSXPathException : public DOMObject { public: JSXPathException(PassRefPtr<JSC::Structure>, PassRefPtr<XPathException>); virtual ~JSXPathException(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); XPathException* impl() const { return m_impl.get(); } private: RefPtr<XPathException> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, XPathException*); -XPathException* toXPathException(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, XPathException*); +XPathException* toXPathException(JSC::JSValue); class JSXPathExceptionPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -72,17 +73,17 @@ public: // Functions -JSC::JSValuePtr jsXPathExceptionPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXPathExceptionPrototypeFunctionToString(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsXPathExceptionCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathExceptionName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathExceptionMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathExceptionCode(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathExceptionName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathExceptionMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsXPathExceptionINVALID_EXPRESSION_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathExceptionTYPE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathExceptionINVALID_EXPRESSION_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathExceptionTYPE_ERR(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.cpp b/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.cpp index a7a6259d75..743d22bee5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.cpp @@ -39,7 +39,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSXPathExpression) +ASSERT_CLASS_FITS_IN_CELL(JSXPathExpression); /* Hash table */ @@ -75,13 +75,13 @@ public: JSXPathExpressionConstructor(ExecState* exec) : DOMObject(JSXPathExpressionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSXPathExpressionPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSXPathExpressionPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -111,9 +111,9 @@ static const HashTable JSXPathExpressionPrototypeTable = const ClassInfo JSXPathExpressionPrototype::s_info = { "XPathExpressionPrototype", 0, &JSXPathExpressionPrototypeTable, 0 }; -JSObject* JSXPathExpressionPrototype::self(ExecState* exec) +JSObject* JSXPathExpressionPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSXPathExpression>(exec); + return getDOMPrototype<JSXPathExpression>(exec, globalObject); } bool JSXPathExpressionPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -132,12 +132,11 @@ JSXPathExpression::JSXPathExpression(PassRefPtr<Structure> structure, PassRefPtr JSXPathExpression::~JSXPathExpression() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSXPathExpression::createPrototype(ExecState* exec) +JSObject* JSXPathExpression::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSXPathExpressionPrototype(JSXPathExpressionPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSXPathExpressionPrototype(JSXPathExpressionPrototype::createStructure(globalObject->objectPrototype())); } bool JSXPathExpression::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -145,39 +144,40 @@ bool JSXPathExpression::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticValueSlot<JSXPathExpression, Base>(exec, &JSXPathExpressionTable, this, propertyName, slot); } -JSValuePtr jsXPathExpressionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXPathExpressionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSXPathExpression*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSXPathExpression::getConstructor(ExecState* exec) +JSValue JSXPathExpression::getConstructor(ExecState* exec) { return getDOMConstructor<JSXPathExpressionConstructor>(exec); } -JSValuePtr jsXPathExpressionPrototypeFunctionEvaluate(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXPathExpressionPrototypeFunctionEvaluate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXPathExpression::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXPathExpression::s_info)) return throwError(exec, TypeError); JSXPathExpression* castedThisObj = static_cast<JSXPathExpression*>(asObject(thisValue)); XPathExpression* imp = static_cast<XPathExpression*>(castedThisObj->impl()); ExceptionCode ec = 0; - Node* contextNode = toNode(args.at(exec, 0)); - unsigned short type = args.at(exec, 1)->toInt32(exec); - XPathResult* inResult = toXPathResult(args.at(exec, 2)); + Node* contextNode = toNode(args.at(0)); + unsigned short type = args.at(1).toInt32(exec); + XPathResult* inResult = toXPathResult(args.at(2)); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->evaluate(contextNode, type, inResult, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->evaluate(contextNode, type, inResult, ec))); setDOMException(exec, ec); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, XPathExpression* object) +JSC::JSValue toJS(JSC::ExecState* exec, XPathExpression* object) { return getDOMObjectWrapper<JSXPathExpression>(exec, object); } -XPathExpression* toXPathExpression(JSC::JSValuePtr value) +XPathExpression* toXPathExpression(JSC::JSValue value) { - return value->isObject(&JSXPathExpression::s_info) ? static_cast<JSXPathExpression*>(asObject(value))->impl() : 0; + return value.isObject(&JSXPathExpression::s_info) ? static_cast<JSXPathExpression*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.h b/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.h index d18b0019ef..6f48e8dbd9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.h @@ -37,33 +37,34 @@ class JSXPathExpression : public DOMObject { public: JSXPathExpression(PassRefPtr<JSC::Structure>, PassRefPtr<XPathExpression>); virtual ~JSXPathExpression(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); XPathExpression* impl() const { return m_impl.get(); } private: RefPtr<XPathExpression> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, XPathExpression*); -XPathExpression* toXPathExpression(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, XPathExpression*); +XPathExpression* toXPathExpression(JSC::JSValue); class JSXPathExpressionPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -72,10 +73,10 @@ public: // Functions -JSC::JSValuePtr jsXPathExpressionPrototypeFunctionEvaluate(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXPathExpressionPrototypeFunctionEvaluate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsXPathExpressionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathExpressionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathNSResolver.cpp b/src/3rdparty/webkit/WebCore/generated/JSXPathNSResolver.cpp index a56a99882f..be0e19ef6d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathNSResolver.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathNSResolver.cpp @@ -38,7 +38,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSXPathNSResolver) +ASSERT_CLASS_FITS_IN_CELL(JSXPathNSResolver); /* Hash table for prototype */ @@ -57,9 +57,9 @@ static const HashTable JSXPathNSResolverPrototypeTable = const ClassInfo JSXPathNSResolverPrototype::s_info = { "XPathNSResolverPrototype", 0, &JSXPathNSResolverPrototypeTable, 0 }; -JSObject* JSXPathNSResolverPrototype::self(ExecState* exec) +JSObject* JSXPathNSResolverPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSXPathNSResolver>(exec); + return getDOMPrototype<JSXPathNSResolver>(exec, globalObject); } bool JSXPathNSResolverPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -78,34 +78,34 @@ JSXPathNSResolver::JSXPathNSResolver(PassRefPtr<Structure> structure, PassRefPtr JSXPathNSResolver::~JSXPathNSResolver() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSXPathNSResolver::createPrototype(ExecState* exec) +JSObject* JSXPathNSResolver::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSXPathNSResolverPrototype(JSXPathNSResolverPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSXPathNSResolverPrototype(JSXPathNSResolverPrototype::createStructure(globalObject->objectPrototype())); } -JSValuePtr jsXPathNSResolverPrototypeFunctionLookupNamespaceURI(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXPathNSResolverPrototypeFunctionLookupNamespaceURI(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXPathNSResolver::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXPathNSResolver::s_info)) return throwError(exec, TypeError); JSXPathNSResolver* castedThisObj = static_cast<JSXPathNSResolver*>(asObject(thisValue)); XPathNSResolver* imp = static_cast<XPathNSResolver*>(castedThisObj->impl()); - const UString& prefix = args.at(exec, 0)->toString(exec); + const UString& prefix = args.at(0).toString(exec); - JSC::JSValuePtr result = jsStringOrNull(exec, imp->lookupNamespaceURI(prefix)); + JSC::JSValue result = jsStringOrNull(exec, imp->lookupNamespaceURI(prefix)); return result; } -JSC::JSValuePtr toJS(JSC::ExecState* exec, XPathNSResolver* object) +JSC::JSValue toJS(JSC::ExecState* exec, XPathNSResolver* object) { return getDOMObjectWrapper<JSXPathNSResolver>(exec, object); } -XPathNSResolver* toXPathNSResolver(JSC::JSValuePtr value) +XPathNSResolver* toXPathNSResolver(JSC::JSValue value) { - return value->isObject(&JSXPathNSResolver::s_info) ? static_cast<JSXPathNSResolver*>(asObject(value))->impl() : 0; + return value.isObject(&JSXPathNSResolver::s_info) ? static_cast<JSXPathNSResolver*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathNSResolver.h b/src/3rdparty/webkit/WebCore/generated/JSXPathNSResolver.h index 0219093d47..3cc8db99b2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathNSResolver.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathNSResolver.h @@ -37,7 +37,7 @@ class JSXPathNSResolver : public DOMObject { public: JSXPathNSResolver(PassRefPtr<JSC::Structure>, PassRefPtr<XPathNSResolver>); virtual ~JSXPathNSResolver(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; @@ -47,16 +47,17 @@ private: RefPtr<XPathNSResolver> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, XPathNSResolver*); -XPathNSResolver* toXPathNSResolver(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, XPathNSResolver*); +XPathNSResolver* toXPathNSResolver(JSC::JSValue); class JSXPathNSResolverPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -65,7 +66,7 @@ public: // Functions -JSC::JSValuePtr jsXPathNSResolverPrototypeFunctionLookupNamespaceURI(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXPathNSResolverPrototypeFunctionLookupNamespaceURI(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathResult.cpp b/src/3rdparty/webkit/WebCore/generated/JSXPathResult.cpp index 1dd7ffa540..a6263ae612 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathResult.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathResult.cpp @@ -40,7 +40,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSXPathResult) +ASSERT_CLASS_FITS_IN_CELL(JSXPathResult); /* Hash table */ @@ -93,13 +93,13 @@ public: JSXPathResultConstructor(ExecState* exec) : DOMObject(JSXPathResultConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSXPathResultPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSXPathResultPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } static const ClassInfo s_info; - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } @@ -140,9 +140,9 @@ static const HashTable JSXPathResultPrototypeTable = const ClassInfo JSXPathResultPrototype::s_info = { "XPathResultPrototype", 0, &JSXPathResultPrototypeTable, 0 }; -JSObject* JSXPathResultPrototype::self(ExecState* exec) +JSObject* JSXPathResultPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSXPathResult>(exec); + return getDOMPrototype<JSXPathResult>(exec, globalObject); } bool JSXPathResultPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -161,12 +161,11 @@ JSXPathResult::JSXPathResult(PassRefPtr<Structure> structure, PassRefPtr<XPathRe JSXPathResult::~JSXPathResult() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSXPathResult::createPrototype(ExecState* exec) +JSObject* JSXPathResult::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSXPathResultPrototype(JSXPathResultPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSXPathResultPrototype(JSXPathResultPrototype::createStructure(globalObject->objectPrototype())); } bool JSXPathResult::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -174,160 +173,164 @@ bool JSXPathResult::getOwnPropertySlot(ExecState* exec, const Identifier& proper return getStaticValueSlot<JSXPathResult, Base>(exec, &JSXPathResultTable, this, propertyName, slot); } -JSValuePtr jsXPathResultResultType(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXPathResultResultType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XPathResult* imp = static_cast<XPathResult*>(static_cast<JSXPathResult*>(asObject(slot.slotBase()))->impl()); return jsNumber(exec, imp->resultType()); } -JSValuePtr jsXPathResultNumberValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXPathResultNumberValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { ExceptionCode ec = 0; XPathResult* imp = static_cast<XPathResult*>(static_cast<JSXPathResult*>(asObject(slot.slotBase()))->impl()); - JSC::JSValuePtr result = jsNumber(exec, imp->numberValue(ec)); + JSC::JSValue result = jsNumber(exec, imp->numberValue(ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsXPathResultStringValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXPathResultStringValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { ExceptionCode ec = 0; XPathResult* imp = static_cast<XPathResult*>(static_cast<JSXPathResult*>(asObject(slot.slotBase()))->impl()); - JSC::JSValuePtr result = jsString(exec, imp->stringValue(ec)); + JSC::JSValue result = jsString(exec, imp->stringValue(ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsXPathResultBooleanValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXPathResultBooleanValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { ExceptionCode ec = 0; XPathResult* imp = static_cast<XPathResult*>(static_cast<JSXPathResult*>(asObject(slot.slotBase()))->impl()); - JSC::JSValuePtr result = jsBoolean(imp->booleanValue(ec)); + JSC::JSValue result = jsBoolean(imp->booleanValue(ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsXPathResultSingleNodeValue(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXPathResultSingleNodeValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { ExceptionCode ec = 0; XPathResult* imp = static_cast<XPathResult*>(static_cast<JSXPathResult*>(asObject(slot.slotBase()))->impl()); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->singleNodeValue(ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->singleNodeValue(ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsXPathResultInvalidIteratorState(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXPathResultInvalidIteratorState(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); XPathResult* imp = static_cast<XPathResult*>(static_cast<JSXPathResult*>(asObject(slot.slotBase()))->impl()); return jsBoolean(imp->invalidIteratorState()); } -JSValuePtr jsXPathResultSnapshotLength(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXPathResultSnapshotLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { ExceptionCode ec = 0; XPathResult* imp = static_cast<XPathResult*>(static_cast<JSXPathResult*>(asObject(slot.slotBase()))->impl()); - JSC::JSValuePtr result = jsNumber(exec, imp->snapshotLength(ec)); + JSC::JSValue result = jsNumber(exec, imp->snapshotLength(ec)); setDOMException(exec, ec); return result; } -JSValuePtr jsXPathResultConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsXPathResultConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { return static_cast<JSXPathResult*>(asObject(slot.slotBase()))->getConstructor(exec); } -JSValuePtr JSXPathResult::getConstructor(ExecState* exec) +JSValue JSXPathResult::getConstructor(ExecState* exec) { return getDOMConstructor<JSXPathResultConstructor>(exec); } -JSValuePtr jsXPathResultPrototypeFunctionIterateNext(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXPathResultPrototypeFunctionIterateNext(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXPathResult::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXPathResult::s_info)) return throwError(exec, TypeError); JSXPathResult* castedThisObj = static_cast<JSXPathResult*>(asObject(thisValue)); XPathResult* imp = static_cast<XPathResult*>(castedThisObj->impl()); ExceptionCode ec = 0; - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->iterateNext(ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->iterateNext(ec))); setDOMException(exec, ec); return result; } -JSValuePtr jsXPathResultPrototypeFunctionSnapshotItem(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsXPathResultPrototypeFunctionSnapshotItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSXPathResult::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSXPathResult::s_info)) return throwError(exec, TypeError); JSXPathResult* castedThisObj = static_cast<JSXPathResult*>(asObject(thisValue)); XPathResult* imp = static_cast<XPathResult*>(castedThisObj->impl()); ExceptionCode ec = 0; - unsigned index = args.at(exec, 0)->toInt32(exec); + unsigned index = args.at(0).toInt32(exec); - JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->snapshotItem(index, ec))); + JSC::JSValue result = toJS(exec, WTF::getPtr(imp->snapshotItem(index, ec))); setDOMException(exec, ec); return result; } // Constant getters -JSValuePtr jsXPathResultANY_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXPathResultANY_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(0)); } -JSValuePtr jsXPathResultNUMBER_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXPathResultNUMBER_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(1)); } -JSValuePtr jsXPathResultSTRING_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXPathResultSTRING_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(2)); } -JSValuePtr jsXPathResultBOOLEAN_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXPathResultBOOLEAN_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(3)); } -JSValuePtr jsXPathResultUNORDERED_NODE_ITERATOR_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXPathResultUNORDERED_NODE_ITERATOR_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(4)); } -JSValuePtr jsXPathResultORDERED_NODE_ITERATOR_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXPathResultORDERED_NODE_ITERATOR_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(5)); } -JSValuePtr jsXPathResultUNORDERED_NODE_SNAPSHOT_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXPathResultUNORDERED_NODE_SNAPSHOT_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(6)); } -JSValuePtr jsXPathResultORDERED_NODE_SNAPSHOT_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXPathResultORDERED_NODE_SNAPSHOT_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(7)); } -JSValuePtr jsXPathResultANY_UNORDERED_NODE_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXPathResultANY_UNORDERED_NODE_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(8)); } -JSValuePtr jsXPathResultFIRST_ORDERED_NODE_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue jsXPathResultFIRST_ORDERED_NODE_TYPE(ExecState* exec, const Identifier&, const PropertySlot&) { return jsNumber(exec, static_cast<int>(9)); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, XPathResult* object) +JSC::JSValue toJS(JSC::ExecState* exec, XPathResult* object) { return getDOMObjectWrapper<JSXPathResult>(exec, object); } -XPathResult* toXPathResult(JSC::JSValuePtr value) +XPathResult* toXPathResult(JSC::JSValue value) { - return value->isObject(&JSXPathResult::s_info) ? static_cast<JSXPathResult*>(asObject(value))->impl() : 0; + return value.isObject(&JSXPathResult::s_info) ? static_cast<JSXPathResult*>(asObject(value))->impl() : 0; } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathResult.h b/src/3rdparty/webkit/WebCore/generated/JSXPathResult.h index 055adc32c0..742a10d745 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathResult.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathResult.h @@ -37,33 +37,34 @@ class JSXPathResult : public DOMObject { public: JSXPathResult(PassRefPtr<JSC::Structure>, PassRefPtr<XPathResult>); virtual ~JSXPathResult(); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValuePtr getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*); XPathResult* impl() const { return m_impl.get(); } private: RefPtr<XPathResult> m_impl; }; -JSC::JSValuePtr toJS(JSC::ExecState*, XPathResult*); -XPathResult* toXPathResult(JSC::JSValuePtr); +JSC::JSValue toJS(JSC::ExecState*, XPathResult*); +XPathResult* toXPathResult(JSC::JSValue); class JSXPathResultPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } @@ -72,30 +73,30 @@ public: // Functions -JSC::JSValuePtr jsXPathResultPrototypeFunctionIterateNext(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXPathResultPrototypeFunctionSnapshotItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXPathResultPrototypeFunctionIterateNext(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsXPathResultPrototypeFunctionSnapshotItem(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValuePtr jsXPathResultResultType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathResultNumberValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathResultStringValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathResultBooleanValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathResultSingleNodeValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathResultInvalidIteratorState(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathResultSnapshotLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathResultConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultResultType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultNumberValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultStringValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultBooleanValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultSingleNodeValue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultInvalidIteratorState(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultSnapshotLength(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); // Constants -JSC::JSValuePtr jsXPathResultANY_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathResultNUMBER_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathResultSTRING_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathResultBOOLEAN_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathResultUNORDERED_NODE_ITERATOR_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathResultORDERED_NODE_ITERATOR_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathResultUNORDERED_NODE_SNAPSHOT_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathResultORDERED_NODE_SNAPSHOT_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathResultANY_UNORDERED_NODE_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -JSC::JSValuePtr jsXPathResultFIRST_ORDERED_NODE_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultANY_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultNUMBER_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultSTRING_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultBOOLEAN_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultUNORDERED_NODE_ITERATOR_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultORDERED_NODE_ITERATOR_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultUNORDERED_NODE_SNAPSHOT_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultORDERED_NODE_SNAPSHOT_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultANY_UNORDERED_NODE_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsXPathResultFIRST_ORDERED_NODE_TYPE(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/generated/JSXSLTProcessor.cpp b/src/3rdparty/webkit/WebCore/generated/JSXSLTProcessor.cpp deleted file mode 100644 index 3ec48fb2fe..0000000000 --- a/src/3rdparty/webkit/WebCore/generated/JSXSLTProcessor.cpp +++ /dev/null @@ -1,177 +0,0 @@ -/* - This file is part of the WebKit open source project. - This file has been generated by generate-bindings.pl. DO NOT MODIFY! - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "config.h" - - -#if ENABLE(XSLT) - -#include "JSXSLTProcessor.h" - -#include <wtf/GetPtr.h> - -#include "Document.h" -#include "DocumentFragment.h" -#include "NodeFilter.h" -#include "XSLTProcessor.h" - -#include <runtime/Error.h> - -using namespace JSC; - -namespace WebCore { - -ASSERT_CLASS_FITS_IN_CELL(JSXSLTProcessor) - -/* Hash table for prototype */ - -static const HashTableValue JSXSLTProcessorPrototypeTableValues[9] = -{ - { "importStylesheet", DontDelete|Function, (intptr_t)jsXSLTProcessorPrototypeFunctionImportStylesheet, (intptr_t)1 }, - { "transformToFragment", DontDelete|Function, (intptr_t)jsXSLTProcessorPrototypeFunctionTransformToFragment, (intptr_t)2 }, - { "transformToDocument", DontDelete|Function, (intptr_t)jsXSLTProcessorPrototypeFunctionTransformToDocument, (intptr_t)1 }, - { "setParameter", DontDelete|Function, (intptr_t)jsXSLTProcessorPrototypeFunctionSetParameter, (intptr_t)3 }, - { "getParameter", DontDelete|Function, (intptr_t)jsXSLTProcessorPrototypeFunctionGetParameter, (intptr_t)2 }, - { "removeParameter", DontDelete|Function, (intptr_t)jsXSLTProcessorPrototypeFunctionRemoveParameter, (intptr_t)2 }, - { "clearParameters", DontDelete|Function, (intptr_t)jsXSLTProcessorPrototypeFunctionClearParameters, (intptr_t)0 }, - { "reset", DontDelete|Function, (intptr_t)jsXSLTProcessorPrototypeFunctionReset, (intptr_t)0 }, - { 0, 0, 0, 0 } -}; - -static const HashTable JSXSLTProcessorPrototypeTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 63, JSXSLTProcessorPrototypeTableValues, 0 }; -#else - { 17, 15, JSXSLTProcessorPrototypeTableValues, 0 }; -#endif - -const ClassInfo JSXSLTProcessorPrototype::s_info = { "XSLTProcessorPrototype", 0, &JSXSLTProcessorPrototypeTable, 0 }; - -JSObject* JSXSLTProcessorPrototype::self(ExecState* exec) -{ - return getDOMPrototype<JSXSLTProcessor>(exec); -} - -bool JSXSLTProcessorPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) -{ - return getStaticFunctionSlot<JSObject>(exec, &JSXSLTProcessorPrototypeTable, this, propertyName, slot); -} - -const ClassInfo JSXSLTProcessor::s_info = { "XSLTProcessor", 0, 0, 0 }; - -JSXSLTProcessor::JSXSLTProcessor(PassRefPtr<Structure> structure, PassRefPtr<XSLTProcessor> impl) - : DOMObject(structure) - , m_impl(impl) -{ -} - -JSXSLTProcessor::~JSXSLTProcessor() -{ - forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - -} - -JSObject* JSXSLTProcessor::createPrototype(ExecState* exec) -{ - return new (exec) JSXSLTProcessorPrototype(JSXSLTProcessorPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); -} - -JSValuePtr jsXSLTProcessorPrototypeFunctionImportStylesheet(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) -{ - if (!thisValue->isObject(&JSXSLTProcessor::s_info)) - return throwError(exec, TypeError); - JSXSLTProcessor* castedThisObj = static_cast<JSXSLTProcessor*>(asObject(thisValue)); - return castedThisObj->importStylesheet(exec, args); -} - -JSValuePtr jsXSLTProcessorPrototypeFunctionTransformToFragment(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) -{ - if (!thisValue->isObject(&JSXSLTProcessor::s_info)) - return throwError(exec, TypeError); - JSXSLTProcessor* castedThisObj = static_cast<JSXSLTProcessor*>(asObject(thisValue)); - return castedThisObj->transformToFragment(exec, args); -} - -JSValuePtr jsXSLTProcessorPrototypeFunctionTransformToDocument(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) -{ - if (!thisValue->isObject(&JSXSLTProcessor::s_info)) - return throwError(exec, TypeError); - JSXSLTProcessor* castedThisObj = static_cast<JSXSLTProcessor*>(asObject(thisValue)); - return castedThisObj->transformToDocument(exec, args); -} - -JSValuePtr jsXSLTProcessorPrototypeFunctionSetParameter(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) -{ - if (!thisValue->isObject(&JSXSLTProcessor::s_info)) - return throwError(exec, TypeError); - JSXSLTProcessor* castedThisObj = static_cast<JSXSLTProcessor*>(asObject(thisValue)); - return castedThisObj->setParameter(exec, args); -} - -JSValuePtr jsXSLTProcessorPrototypeFunctionGetParameter(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) -{ - if (!thisValue->isObject(&JSXSLTProcessor::s_info)) - return throwError(exec, TypeError); - JSXSLTProcessor* castedThisObj = static_cast<JSXSLTProcessor*>(asObject(thisValue)); - return castedThisObj->getParameter(exec, args); -} - -JSValuePtr jsXSLTProcessorPrototypeFunctionRemoveParameter(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) -{ - if (!thisValue->isObject(&JSXSLTProcessor::s_info)) - return throwError(exec, TypeError); - JSXSLTProcessor* castedThisObj = static_cast<JSXSLTProcessor*>(asObject(thisValue)); - return castedThisObj->removeParameter(exec, args); -} - -JSValuePtr jsXSLTProcessorPrototypeFunctionClearParameters(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) -{ - if (!thisValue->isObject(&JSXSLTProcessor::s_info)) - return throwError(exec, TypeError); - JSXSLTProcessor* castedThisObj = static_cast<JSXSLTProcessor*>(asObject(thisValue)); - XSLTProcessor* imp = static_cast<XSLTProcessor*>(castedThisObj->impl()); - - imp->clearParameters(); - return jsUndefined(); -} - -JSValuePtr jsXSLTProcessorPrototypeFunctionReset(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) -{ - if (!thisValue->isObject(&JSXSLTProcessor::s_info)) - return throwError(exec, TypeError); - JSXSLTProcessor* castedThisObj = static_cast<JSXSLTProcessor*>(asObject(thisValue)); - XSLTProcessor* imp = static_cast<XSLTProcessor*>(castedThisObj->impl()); - - imp->reset(); - return jsUndefined(); -} - -JSC::JSValuePtr toJS(JSC::ExecState* exec, XSLTProcessor* object) -{ - return getDOMObjectWrapper<JSXSLTProcessor>(exec, object); -} -XSLTProcessor* toXSLTProcessor(JSC::JSValuePtr value) -{ - return value->isObject(&JSXSLTProcessor::s_info) ? static_cast<JSXSLTProcessor*>(asObject(value))->impl() : 0; -} - -} - -#endif // ENABLE(XSLT) diff --git a/src/3rdparty/webkit/WebCore/generated/JSXSLTProcessor.h b/src/3rdparty/webkit/WebCore/generated/JSXSLTProcessor.h deleted file mode 100644 index 3a7138815a..0000000000 --- a/src/3rdparty/webkit/WebCore/generated/JSXSLTProcessor.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - This file is part of the WebKit open source project. - This file has been generated by generate-bindings.pl. DO NOT MODIFY! - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef JSXSLTProcessor_h -#define JSXSLTProcessor_h - - -#if ENABLE(XSLT) - -#include "JSDOMBinding.h" -#include <runtime/JSGlobalObject.h> -#include <runtime/ObjectPrototype.h> - -namespace WebCore { - -class XSLTProcessor; - -class JSXSLTProcessor : public DOMObject { - typedef DOMObject Base; -public: - JSXSLTProcessor(PassRefPtr<JSC::Structure>, PassRefPtr<XSLTProcessor>); - virtual ~JSXSLTProcessor(); - static JSC::JSObject* createPrototype(JSC::ExecState*); - virtual const JSC::ClassInfo* classInfo() const { return &s_info; } - static const JSC::ClassInfo s_info; - - - // Custom functions - JSC::JSValuePtr importStylesheet(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr transformToFragment(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr transformToDocument(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr setParameter(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr getParameter(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValuePtr removeParameter(JSC::ExecState*, const JSC::ArgList&); - XSLTProcessor* impl() const { return m_impl.get(); } - -private: - RefPtr<XSLTProcessor> m_impl; -}; - -JSC::JSValuePtr toJS(JSC::ExecState*, XSLTProcessor*); -XSLTProcessor* toXSLTProcessor(JSC::JSValuePtr); - -class JSXSLTProcessorPrototype : public JSC::JSObject { -public: - static JSC::JSObject* self(JSC::ExecState*); - virtual const JSC::ClassInfo* classInfo() const { return &s_info; } - static const JSC::ClassInfo s_info; - virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValuePtr prototype) - { - return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); - } - JSXSLTProcessorPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } -}; - -// Functions - -JSC::JSValuePtr jsXSLTProcessorPrototypeFunctionImportStylesheet(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXSLTProcessorPrototypeFunctionTransformToFragment(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXSLTProcessorPrototypeFunctionTransformToDocument(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXSLTProcessorPrototypeFunctionSetParameter(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXSLTProcessorPrototypeFunctionGetParameter(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXSLTProcessorPrototypeFunctionRemoveParameter(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXSLTProcessorPrototypeFunctionClearParameters(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); -JSC::JSValuePtr jsXSLTProcessorPrototypeFunctionReset(JSC::ExecState*, JSC::JSObject*, JSC::JSValuePtr, const JSC::ArgList&); - -} // namespace WebCore - -#endif // ENABLE(XSLT) - -#endif diff --git a/src/3rdparty/webkit/WebCore/generated/Lexer.lut.h b/src/3rdparty/webkit/WebCore/generated/Lexer.lut.h index 638f45a620..4c46e078db 100644 --- a/src/3rdparty/webkit/WebCore/generated/Lexer.lut.h +++ b/src/3rdparty/webkit/WebCore/generated/Lexer.lut.h @@ -45,10 +45,5 @@ static const struct HashTableValue mainTableValues[37] = { }; extern const struct HashTable mainTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 1023, mainTableValues, 0 }; -#else { 133, 127, mainTableValues, 0 }; -#endif - } // namespace diff --git a/src/3rdparty/webkit/WebCore/generated/MathObject.lut.h b/src/3rdparty/webkit/WebCore/generated/MathObject.lut.h index cd8c507db9..c8359c1700 100644 --- a/src/3rdparty/webkit/WebCore/generated/MathObject.lut.h +++ b/src/3rdparty/webkit/WebCore/generated/MathObject.lut.h @@ -27,10 +27,5 @@ static const struct HashTableValue mathTableValues[19] = { }; extern const struct HashTable mathTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 511, mathTableValues, 0 }; -#else { 67, 63, mathTableValues, 0 }; -#endif - } // namespace diff --git a/src/3rdparty/webkit/WebCore/generated/NumberConstructor.lut.h b/src/3rdparty/webkit/WebCore/generated/NumberConstructor.lut.h index e726f5c7fe..6879c036d8 100644 --- a/src/3rdparty/webkit/WebCore/generated/NumberConstructor.lut.h +++ b/src/3rdparty/webkit/WebCore/generated/NumberConstructor.lut.h @@ -14,10 +14,5 @@ static const struct HashTableValue numberTableValues[6] = { }; extern const struct HashTable numberTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 15, numberTableValues, 0 }; -#else { 16, 15, numberTableValues, 0 }; -#endif - } // namespace diff --git a/src/3rdparty/webkit/WebCore/generated/RegExpConstructor.lut.h b/src/3rdparty/webkit/WebCore/generated/RegExpConstructor.lut.h index e9dfed227e..0bdf10c329 100644 --- a/src/3rdparty/webkit/WebCore/generated/RegExpConstructor.lut.h +++ b/src/3rdparty/webkit/WebCore/generated/RegExpConstructor.lut.h @@ -30,10 +30,5 @@ static const struct HashTableValue regExpConstructorTableValues[22] = { }; extern const struct HashTable regExpConstructorTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 511, regExpConstructorTableValues, 0 }; -#else { 65, 63, regExpConstructorTableValues, 0 }; -#endif - } // namespace diff --git a/src/3rdparty/webkit/WebCore/generated/RegExpObject.lut.h b/src/3rdparty/webkit/WebCore/generated/RegExpObject.lut.h index 39230b9197..69a745d3cb 100644 --- a/src/3rdparty/webkit/WebCore/generated/RegExpObject.lut.h +++ b/src/3rdparty/webkit/WebCore/generated/RegExpObject.lut.h @@ -14,10 +14,5 @@ static const struct HashTableValue regExpTableValues[6] = { }; extern const struct HashTable regExpTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 31, regExpTableValues, 0 }; -#else { 17, 15, regExpTableValues, 0 }; -#endif - } // namespace diff --git a/src/3rdparty/webkit/WebCore/generated/SVGElementFactory.cpp b/src/3rdparty/webkit/WebCore/generated/SVGElementFactory.cpp index c39dcc10d3..3b5318bdf7 100644 --- a/src/3rdparty/webkit/WebCore/generated/SVGElementFactory.cpp +++ b/src/3rdparty/webkit/WebCore/generated/SVGElementFactory.cpp @@ -49,29 +49,6 @@ #include "SVGDefsElement.h" #include "SVGDescElement.h" #include "SVGEllipseElement.h" -#include "SVGFEBlendElement.h" -#include "SVGFEColorMatrixElement.h" -#include "SVGFEComponentTransferElement.h" -#include "SVGFECompositeElement.h" -#include "SVGFEDiffuseLightingElement.h" -#include "SVGFEDisplacementMapElement.h" -#include "SVGFEDistantLightElement.h" -#include "SVGFEFloodElement.h" -#include "SVGFEFuncAElement.h" -#include "SVGFEFuncBElement.h" -#include "SVGFEFuncGElement.h" -#include "SVGFEFuncRElement.h" -#include "SVGFEGaussianBlurElement.h" -#include "SVGFEImageElement.h" -#include "SVGFEMergeElement.h" -#include "SVGFEMergeNodeElement.h" -#include "SVGFEOffsetElement.h" -#include "SVGFEPointLightElement.h" -#include "SVGFESpecularLightingElement.h" -#include "SVGFESpotLightElement.h" -#include "SVGFETileElement.h" -#include "SVGFETurbulenceElement.h" -#include "SVGFilterElement.h" #include "SVGFontElement.h" #include "SVGFontFaceElement.h" #include "SVGFontFaceFormatElement.h" @@ -112,388 +89,278 @@ #include "SVGViewElement.h" #include <wtf/HashMap.h> -using namespace WebCore; - -typedef PassRefPtr<SVGElement> (*ConstructorFunction)(Document*, bool createdByParser); -typedef WTF::HashMap<AtomicStringImpl*, ConstructorFunction> FunctionMap; - -static FunctionMap* gFunctionMap = 0; - namespace WebCore { -#if ENABLE(SVG) -static PassRefPtr<SVGElement> aConstructor(Document* doc, bool createdByParser) -{ - return new SVGAElement(SVGNames::aTag, doc); -} - -static PassRefPtr<SVGElement> altGlyphConstructor(Document* doc, bool createdByParser) -{ - return new SVGAltGlyphElement(SVGNames::altGlyphTag, doc); -} - -static PassRefPtr<SVGElement> animateConstructor(Document* doc, bool createdByParser) -{ - return new SVGAnimateElement(SVGNames::animateTag, doc); -} - -static PassRefPtr<SVGElement> animateColorConstructor(Document* doc, bool createdByParser) -{ - return new SVGAnimateColorElement(SVGNames::animateColorTag, doc); -} - -static PassRefPtr<SVGElement> animateMotionConstructor(Document* doc, bool createdByParser) -{ - return new SVGAnimateMotionElement(SVGNames::animateMotionTag, doc); -} - -static PassRefPtr<SVGElement> animateTransformConstructor(Document* doc, bool createdByParser) -{ - return new SVGAnimateTransformElement(SVGNames::animateTransformTag, doc); -} - -static PassRefPtr<SVGElement> circleConstructor(Document* doc, bool createdByParser) -{ - return new SVGCircleElement(SVGNames::circleTag, doc); -} - -static PassRefPtr<SVGElement> clipPathConstructor(Document* doc, bool createdByParser) -{ - return new SVGClipPathElement(SVGNames::clipPathTag, doc); -} - -static PassRefPtr<SVGElement> cursorConstructor(Document* doc, bool createdByParser) -{ - return new SVGCursorElement(SVGNames::cursorTag, doc); -} - -static PassRefPtr<SVGElement> definition_srcConstructor(Document* doc, bool createdByParser) -{ - return new SVGDefinitionSrcElement(SVGNames::definition_srcTag, doc); -} - -static PassRefPtr<SVGElement> defsConstructor(Document* doc, bool createdByParser) -{ - return new SVGDefsElement(SVGNames::defsTag, doc); -} - -static PassRefPtr<SVGElement> descConstructor(Document* doc, bool createdByParser) -{ - return new SVGDescElement(SVGNames::descTag, doc); -} - -static PassRefPtr<SVGElement> ellipseConstructor(Document* doc, bool createdByParser) -{ - return new SVGEllipseElement(SVGNames::ellipseTag, doc); -} - -static PassRefPtr<SVGElement> feBlendConstructor(Document* doc, bool createdByParser) -{ - return new SVGFEBlendElement(SVGNames::feBlendTag, doc); -} - -static PassRefPtr<SVGElement> feColorMatrixConstructor(Document* doc, bool createdByParser) -{ - return new SVGFEColorMatrixElement(SVGNames::feColorMatrixTag, doc); -} - -static PassRefPtr<SVGElement> feComponentTransferConstructor(Document* doc, bool createdByParser) -{ - return new SVGFEComponentTransferElement(SVGNames::feComponentTransferTag, doc); -} - -static PassRefPtr<SVGElement> feCompositeConstructor(Document* doc, bool createdByParser) -{ - return new SVGFECompositeElement(SVGNames::feCompositeTag, doc); -} - -static PassRefPtr<SVGElement> feDiffuseLightingConstructor(Document* doc, bool createdByParser) -{ - return new SVGFEDiffuseLightingElement(SVGNames::feDiffuseLightingTag, doc); -} - -static PassRefPtr<SVGElement> feDisplacementMapConstructor(Document* doc, bool createdByParser) -{ - return new SVGFEDisplacementMapElement(SVGNames::feDisplacementMapTag, doc); -} - -static PassRefPtr<SVGElement> feDistantLightConstructor(Document* doc, bool createdByParser) -{ - return new SVGFEDistantLightElement(SVGNames::feDistantLightTag, doc); -} +using namespace SVGNames; -static PassRefPtr<SVGElement> feFloodConstructor(Document* doc, bool createdByParser) -{ - return new SVGFEFloodElement(SVGNames::feFloodTag, doc); -} +typedef PassRefPtr<SVGElement> (*ConstructorFunction)(const QualifiedName&, Document*, bool createdByParser); +typedef HashMap<AtomicStringImpl*, ConstructorFunction> FunctionMap; -static PassRefPtr<SVGElement> feFuncAConstructor(Document* doc, bool createdByParser) -{ - return new SVGFEFuncAElement(SVGNames::feFuncATag, doc); -} +static FunctionMap* gFunctionMap = 0; -static PassRefPtr<SVGElement> feFuncBConstructor(Document* doc, bool createdByParser) +#if ENABLE(SVG) +static PassRefPtr<SVGElement> aConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFEFuncBElement(SVGNames::feFuncBTag, doc); + return new SVGAElement(tagName, doc); } -static PassRefPtr<SVGElement> feFuncGConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> altglyphConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFEFuncGElement(SVGNames::feFuncGTag, doc); + return new SVGAltGlyphElement(tagName, doc); } -static PassRefPtr<SVGElement> feFuncRConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> animateConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFEFuncRElement(SVGNames::feFuncRTag, doc); + return new SVGAnimateElement(tagName, doc); } -static PassRefPtr<SVGElement> feGaussianBlurConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> animatecolorConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFEGaussianBlurElement(SVGNames::feGaussianBlurTag, doc); + return new SVGAnimateColorElement(tagName, doc); } -static PassRefPtr<SVGElement> feImageConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> animatemotionConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFEImageElement(SVGNames::feImageTag, doc); + return new SVGAnimateMotionElement(tagName, doc); } -static PassRefPtr<SVGElement> feMergeConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> animatetransformConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFEMergeElement(SVGNames::feMergeTag, doc); + return new SVGAnimateTransformElement(tagName, doc); } -static PassRefPtr<SVGElement> feMergeNodeConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> circleConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFEMergeNodeElement(SVGNames::feMergeNodeTag, doc); + return new SVGCircleElement(tagName, doc); } -static PassRefPtr<SVGElement> feOffsetConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> clippathConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFEOffsetElement(SVGNames::feOffsetTag, doc); + return new SVGClipPathElement(tagName, doc); } -static PassRefPtr<SVGElement> fePointLightConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> cursorConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFEPointLightElement(SVGNames::fePointLightTag, doc); + return new SVGCursorElement(tagName, doc); } -static PassRefPtr<SVGElement> feSpecularLightingConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> definitionsrcConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFESpecularLightingElement(SVGNames::feSpecularLightingTag, doc); + return new SVGDefinitionSrcElement(tagName, doc); } -static PassRefPtr<SVGElement> feSpotLightConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> defsConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFESpotLightElement(SVGNames::feSpotLightTag, doc); + return new SVGDefsElement(tagName, doc); } -static PassRefPtr<SVGElement> feTileConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> descConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFETileElement(SVGNames::feTileTag, doc); + return new SVGDescElement(tagName, doc); } -static PassRefPtr<SVGElement> feTurbulenceConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> ellipseConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFETurbulenceElement(SVGNames::feTurbulenceTag, doc); + return new SVGEllipseElement(tagName, doc); } -static PassRefPtr<SVGElement> filterConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> fontConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFilterElement(SVGNames::filterTag, doc); + return new SVGFontElement(tagName, doc); } -static PassRefPtr<SVGElement> fontConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> fontfaceConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFontElement(SVGNames::fontTag, doc); + return new SVGFontFaceElement(tagName, doc); } -static PassRefPtr<SVGElement> font_faceConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> fontfaceformatConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFontFaceElement(SVGNames::font_faceTag, doc); + return new SVGFontFaceFormatElement(tagName, doc); } -static PassRefPtr<SVGElement> font_face_formatConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> fontfacenameConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFontFaceFormatElement(SVGNames::font_face_formatTag, doc); + return new SVGFontFaceNameElement(tagName, doc); } -static PassRefPtr<SVGElement> font_face_nameConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> fontfacesrcConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFontFaceNameElement(SVGNames::font_face_nameTag, doc); + return new SVGFontFaceSrcElement(tagName, doc); } -static PassRefPtr<SVGElement> font_face_srcConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> fontfaceuriConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFontFaceSrcElement(SVGNames::font_face_srcTag, doc); + return new SVGFontFaceUriElement(tagName, doc); } -static PassRefPtr<SVGElement> font_face_uriConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> foreignobjectConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGFontFaceUriElement(SVGNames::font_face_uriTag, doc); + return new SVGForeignObjectElement(tagName, doc); } -static PassRefPtr<SVGElement> foreignObjectConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> gConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGForeignObjectElement(SVGNames::foreignObjectTag, doc); + return new SVGGElement(tagName, doc); } -static PassRefPtr<SVGElement> gConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> glyphConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGGElement(SVGNames::gTag, doc); + return new SVGGlyphElement(tagName, doc); } -static PassRefPtr<SVGElement> glyphConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> hkernConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGGlyphElement(SVGNames::glyphTag, doc); + return new SVGHKernElement(tagName, doc); } -static PassRefPtr<SVGElement> hkernConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> imageConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGHKernElement(SVGNames::hkernTag, doc); + return new SVGImageElement(tagName, doc); } -static PassRefPtr<SVGElement> imageConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> lineConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGImageElement(SVGNames::imageTag, doc); + return new SVGLineElement(tagName, doc); } -static PassRefPtr<SVGElement> lineConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> lineargradientConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGLineElement(SVGNames::lineTag, doc); + return new SVGLinearGradientElement(tagName, doc); } -static PassRefPtr<SVGElement> linearGradientConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> markerConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGLinearGradientElement(SVGNames::linearGradientTag, doc); + return new SVGMarkerElement(tagName, doc); } -static PassRefPtr<SVGElement> markerConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> maskConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGMarkerElement(SVGNames::markerTag, doc); + return new SVGMaskElement(tagName, doc); } -static PassRefPtr<SVGElement> maskConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> metadataConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGMaskElement(SVGNames::maskTag, doc); + return new SVGMetadataElement(tagName, doc); } -static PassRefPtr<SVGElement> metadataConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> missingglyphConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGMetadataElement(SVGNames::metadataTag, doc); + return new SVGMissingGlyphElement(tagName, doc); } -static PassRefPtr<SVGElement> missing_glyphConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> mpathConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGMissingGlyphElement(SVGNames::missing_glyphTag, doc); + return new SVGMPathElement(tagName, doc); } -static PassRefPtr<SVGElement> mpathConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> pathConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGMPathElement(SVGNames::mpathTag, doc); + return new SVGPathElement(tagName, doc); } -static PassRefPtr<SVGElement> pathConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> patternConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGPathElement(SVGNames::pathTag, doc); + return new SVGPatternElement(tagName, doc); } -static PassRefPtr<SVGElement> patternConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> polygonConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGPatternElement(SVGNames::patternTag, doc); + return new SVGPolygonElement(tagName, doc); } -static PassRefPtr<SVGElement> polygonConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> polylineConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGPolygonElement(SVGNames::polygonTag, doc); + return new SVGPolylineElement(tagName, doc); } -static PassRefPtr<SVGElement> polylineConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> radialgradientConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGPolylineElement(SVGNames::polylineTag, doc); + return new SVGRadialGradientElement(tagName, doc); } -static PassRefPtr<SVGElement> radialGradientConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> rectConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGRadialGradientElement(SVGNames::radialGradientTag, doc); + return new SVGRectElement(tagName, doc); } -static PassRefPtr<SVGElement> rectConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> scriptConstructor(const QualifiedName& tagName, Document* doc, bool createdByParser) { - return new SVGRectElement(SVGNames::rectTag, doc); + return new SVGScriptElement(tagName, doc, createdByParser); } -static PassRefPtr<SVGElement> scriptConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> setConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGScriptElement(SVGNames::scriptTag, doc, createdByParser); + return new SVGSetElement(tagName, doc); } -static PassRefPtr<SVGElement> setConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> stopConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGSetElement(SVGNames::setTag, doc); + return new SVGStopElement(tagName, doc); } -static PassRefPtr<SVGElement> stopConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> styleConstructor(const QualifiedName& tagName, Document* doc, bool createdByParser) { - return new SVGStopElement(SVGNames::stopTag, doc); + return new SVGStyleElement(tagName, doc, createdByParser); } -static PassRefPtr<SVGElement> styleConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> svgConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGStyleElement(SVGNames::styleTag, doc, createdByParser); + return new SVGSVGElement(tagName, doc); } -static PassRefPtr<SVGElement> svgConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> switchConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGSVGElement(SVGNames::svgTag, doc); + return new SVGSwitchElement(tagName, doc); } -static PassRefPtr<SVGElement> switchConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> symbolConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGSwitchElement(SVGNames::switchTag, doc); + return new SVGSymbolElement(tagName, doc); } -static PassRefPtr<SVGElement> symbolConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> textConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGSymbolElement(SVGNames::symbolTag, doc); + return new SVGTextElement(tagName, doc); } -static PassRefPtr<SVGElement> textConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> textpathConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGTextElement(SVGNames::textTag, doc); + return new SVGTextPathElement(tagName, doc); } -static PassRefPtr<SVGElement> textPathConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> titleConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGTextPathElement(SVGNames::textPathTag, doc); + return new SVGTitleElement(tagName, doc); } -static PassRefPtr<SVGElement> titleConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> trefConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGTitleElement(SVGNames::titleTag, doc); + return new SVGTRefElement(tagName, doc); } -static PassRefPtr<SVGElement> trefConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> tspanConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGTRefElement(SVGNames::trefTag, doc); + return new SVGTSpanElement(tagName, doc); } -static PassRefPtr<SVGElement> tspanConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> useConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGTSpanElement(SVGNames::tspanTag, doc); + return new SVGUseElement(tagName, doc); } -static PassRefPtr<SVGElement> useConstructor(Document* doc, bool createdByParser) +static PassRefPtr<SVGElement> viewConstructor(const QualifiedName& tagName, Document* doc, bool) { - return new SVGUseElement(SVGNames::useTag, doc); + return new SVGViewElement(tagName, doc); } -static PassRefPtr<SVGElement> viewConstructor(Document* doc, bool createdByParser) +#endif +#if ENABLE(SVG) +static void addTag(const QualifiedName& tag, ConstructorFunction func) { - return new SVGViewElement(SVGNames::viewTag, doc); + gFunctionMap->set(tag.localName().impl(), func); } -#endif -#if ENABLE(SVG) static inline void createFunctionMapIfNecessary() { if (gFunctionMap) @@ -502,80 +369,57 @@ static inline void createFunctionMapIfNecessary() gFunctionMap = new FunctionMap; // Populate it with constructor functions. - gFunctionMap->set(SVGNames::aTag.localName().impl(), aConstructor); - gFunctionMap->set(SVGNames::altGlyphTag.localName().impl(), altGlyphConstructor); - gFunctionMap->set(SVGNames::animateTag.localName().impl(), animateConstructor); - gFunctionMap->set(SVGNames::animateColorTag.localName().impl(), animateColorConstructor); - gFunctionMap->set(SVGNames::animateMotionTag.localName().impl(), animateMotionConstructor); - gFunctionMap->set(SVGNames::animateTransformTag.localName().impl(), animateTransformConstructor); - gFunctionMap->set(SVGNames::circleTag.localName().impl(), circleConstructor); - gFunctionMap->set(SVGNames::clipPathTag.localName().impl(), clipPathConstructor); - gFunctionMap->set(SVGNames::cursorTag.localName().impl(), cursorConstructor); - gFunctionMap->set(SVGNames::definition_srcTag.localName().impl(), definition_srcConstructor); - gFunctionMap->set(SVGNames::defsTag.localName().impl(), defsConstructor); - gFunctionMap->set(SVGNames::descTag.localName().impl(), descConstructor); - gFunctionMap->set(SVGNames::ellipseTag.localName().impl(), ellipseConstructor); - gFunctionMap->set(SVGNames::feBlendTag.localName().impl(), feBlendConstructor); - gFunctionMap->set(SVGNames::feColorMatrixTag.localName().impl(), feColorMatrixConstructor); - gFunctionMap->set(SVGNames::feComponentTransferTag.localName().impl(), feComponentTransferConstructor); - gFunctionMap->set(SVGNames::feCompositeTag.localName().impl(), feCompositeConstructor); - gFunctionMap->set(SVGNames::feDiffuseLightingTag.localName().impl(), feDiffuseLightingConstructor); - gFunctionMap->set(SVGNames::feDisplacementMapTag.localName().impl(), feDisplacementMapConstructor); - gFunctionMap->set(SVGNames::feDistantLightTag.localName().impl(), feDistantLightConstructor); - gFunctionMap->set(SVGNames::feFloodTag.localName().impl(), feFloodConstructor); - gFunctionMap->set(SVGNames::feFuncATag.localName().impl(), feFuncAConstructor); - gFunctionMap->set(SVGNames::feFuncBTag.localName().impl(), feFuncBConstructor); - gFunctionMap->set(SVGNames::feFuncGTag.localName().impl(), feFuncGConstructor); - gFunctionMap->set(SVGNames::feFuncRTag.localName().impl(), feFuncRConstructor); - gFunctionMap->set(SVGNames::feGaussianBlurTag.localName().impl(), feGaussianBlurConstructor); - gFunctionMap->set(SVGNames::feImageTag.localName().impl(), feImageConstructor); - gFunctionMap->set(SVGNames::feMergeTag.localName().impl(), feMergeConstructor); - gFunctionMap->set(SVGNames::feMergeNodeTag.localName().impl(), feMergeNodeConstructor); - gFunctionMap->set(SVGNames::feOffsetTag.localName().impl(), feOffsetConstructor); - gFunctionMap->set(SVGNames::fePointLightTag.localName().impl(), fePointLightConstructor); - gFunctionMap->set(SVGNames::feSpecularLightingTag.localName().impl(), feSpecularLightingConstructor); - gFunctionMap->set(SVGNames::feSpotLightTag.localName().impl(), feSpotLightConstructor); - gFunctionMap->set(SVGNames::feTileTag.localName().impl(), feTileConstructor); - gFunctionMap->set(SVGNames::feTurbulenceTag.localName().impl(), feTurbulenceConstructor); - gFunctionMap->set(SVGNames::filterTag.localName().impl(), filterConstructor); - gFunctionMap->set(SVGNames::fontTag.localName().impl(), fontConstructor); - gFunctionMap->set(SVGNames::font_faceTag.localName().impl(), font_faceConstructor); - gFunctionMap->set(SVGNames::font_face_formatTag.localName().impl(), font_face_formatConstructor); - gFunctionMap->set(SVGNames::font_face_nameTag.localName().impl(), font_face_nameConstructor); - gFunctionMap->set(SVGNames::font_face_srcTag.localName().impl(), font_face_srcConstructor); - gFunctionMap->set(SVGNames::font_face_uriTag.localName().impl(), font_face_uriConstructor); - gFunctionMap->set(SVGNames::foreignObjectTag.localName().impl(), foreignObjectConstructor); - gFunctionMap->set(SVGNames::gTag.localName().impl(), gConstructor); - gFunctionMap->set(SVGNames::glyphTag.localName().impl(), glyphConstructor); - gFunctionMap->set(SVGNames::hkernTag.localName().impl(), hkernConstructor); - gFunctionMap->set(SVGNames::imageTag.localName().impl(), imageConstructor); - gFunctionMap->set(SVGNames::lineTag.localName().impl(), lineConstructor); - gFunctionMap->set(SVGNames::linearGradientTag.localName().impl(), linearGradientConstructor); - gFunctionMap->set(SVGNames::markerTag.localName().impl(), markerConstructor); - gFunctionMap->set(SVGNames::maskTag.localName().impl(), maskConstructor); - gFunctionMap->set(SVGNames::metadataTag.localName().impl(), metadataConstructor); - gFunctionMap->set(SVGNames::missing_glyphTag.localName().impl(), missing_glyphConstructor); - gFunctionMap->set(SVGNames::mpathTag.localName().impl(), mpathConstructor); - gFunctionMap->set(SVGNames::pathTag.localName().impl(), pathConstructor); - gFunctionMap->set(SVGNames::patternTag.localName().impl(), patternConstructor); - gFunctionMap->set(SVGNames::polygonTag.localName().impl(), polygonConstructor); - gFunctionMap->set(SVGNames::polylineTag.localName().impl(), polylineConstructor); - gFunctionMap->set(SVGNames::radialGradientTag.localName().impl(), radialGradientConstructor); - gFunctionMap->set(SVGNames::rectTag.localName().impl(), rectConstructor); - gFunctionMap->set(SVGNames::scriptTag.localName().impl(), scriptConstructor); - gFunctionMap->set(SVGNames::setTag.localName().impl(), setConstructor); - gFunctionMap->set(SVGNames::stopTag.localName().impl(), stopConstructor); - gFunctionMap->set(SVGNames::styleTag.localName().impl(), styleConstructor); - gFunctionMap->set(SVGNames::svgTag.localName().impl(), svgConstructor); - gFunctionMap->set(SVGNames::switchTag.localName().impl(), switchConstructor); - gFunctionMap->set(SVGNames::symbolTag.localName().impl(), symbolConstructor); - gFunctionMap->set(SVGNames::textTag.localName().impl(), textConstructor); - gFunctionMap->set(SVGNames::textPathTag.localName().impl(), textPathConstructor); - gFunctionMap->set(SVGNames::titleTag.localName().impl(), titleConstructor); - gFunctionMap->set(SVGNames::trefTag.localName().impl(), trefConstructor); - gFunctionMap->set(SVGNames::tspanTag.localName().impl(), tspanConstructor); - gFunctionMap->set(SVGNames::useTag.localName().impl(), useConstructor); - gFunctionMap->set(SVGNames::viewTag.localName().impl(), viewConstructor); + addTag(aTag, aConstructor); + addTag(altGlyphTag, altglyphConstructor); + addTag(animateTag, animateConstructor); + addTag(animateColorTag, animatecolorConstructor); + addTag(animateMotionTag, animatemotionConstructor); + addTag(animateTransformTag, animatetransformConstructor); + addTag(circleTag, circleConstructor); + addTag(clipPathTag, clippathConstructor); + addTag(cursorTag, cursorConstructor); + addTag(definition_srcTag, definitionsrcConstructor); + addTag(defsTag, defsConstructor); + addTag(descTag, descConstructor); + addTag(ellipseTag, ellipseConstructor); + addTag(fontTag, fontConstructor); + addTag(font_faceTag, fontfaceConstructor); + addTag(font_face_formatTag, fontfaceformatConstructor); + addTag(font_face_nameTag, fontfacenameConstructor); + addTag(font_face_srcTag, fontfacesrcConstructor); + addTag(font_face_uriTag, fontfaceuriConstructor); + addTag(foreignObjectTag, foreignobjectConstructor); + addTag(gTag, gConstructor); + addTag(glyphTag, glyphConstructor); + addTag(hkernTag, hkernConstructor); + addTag(imageTag, imageConstructor); + addTag(lineTag, lineConstructor); + addTag(linearGradientTag, lineargradientConstructor); + addTag(markerTag, markerConstructor); + addTag(maskTag, maskConstructor); + addTag(metadataTag, metadataConstructor); + addTag(missing_glyphTag, missingglyphConstructor); + addTag(mpathTag, mpathConstructor); + addTag(pathTag, pathConstructor); + addTag(patternTag, patternConstructor); + addTag(polygonTag, polygonConstructor); + addTag(polylineTag, polylineConstructor); + addTag(radialGradientTag, radialgradientConstructor); + addTag(rectTag, rectConstructor); + addTag(scriptTag, scriptConstructor); + addTag(setTag, setConstructor); + addTag(stopTag, stopConstructor); + addTag(styleTag, styleConstructor); + addTag(svgTag, svgConstructor); + addTag(switchTag, switchConstructor); + addTag(symbolTag, symbolConstructor); + addTag(textTag, textConstructor); + addTag(textPathTag, textpathConstructor); + addTag(titleTag, titleConstructor); + addTag(trefTag, trefConstructor); + addTag(tspanTag, tspanConstructor); + addTag(useTag, useConstructor); + addTag(viewTag, viewConstructor); } #endif @@ -591,12 +435,10 @@ PassRefPtr<SVGElement> SVGElementFactory::createSVGElement(const QualifiedName& if (settings && settings->usesDashboardBackwardCompatibilityMode()) return 0; #endif - createFunctionMapIfNecessary(); ConstructorFunction func = gFunctionMap->get(qName.localName().impl()); if (func) - return func(doc, createdByParser); - + return func(qName, doc, createdByParser); return new SVGElement(qName, doc); #else return 0; diff --git a/src/3rdparty/webkit/WebCore/generated/SVGElementFactory.h b/src/3rdparty/webkit/WebCore/generated/SVGElementFactory.h index 9c481464c7..edbf308089 100644 --- a/src/3rdparty/webkit/WebCore/generated/SVGElementFactory.h +++ b/src/3rdparty/webkit/WebCore/generated/SVGElementFactory.h @@ -42,13 +42,12 @@ namespace WebCore { namespace WebCore { class SVGElement; - // The idea behind this class is that there will eventually be a mapping from namespace URIs to ElementFactories that can dispense // elements. In a compound document world, the generic createElement function (will end up being virtual) will be called. class SVGElementFactory { public: PassRefPtr<Element> createElement(const WebCore::QualifiedName&, WebCore::Document*, bool createdByParser = true); - static PassRefPtr<SVGElement> createSVGElement(const WebCore::QualifiedName&, WebCore::Document*, bool createdByParser = true); + static PassRefPtr<SVGElement> createSVGElement(const WebCore::QualifiedName&, WebCore::Document*, bool /*createdByParser*/ = true); }; } diff --git a/src/3rdparty/webkit/WebCore/generated/SVGNames.cpp b/src/3rdparty/webkit/WebCore/generated/SVGNames.cpp index 417d1f7637..445a59f256 100644 --- a/src/3rdparty/webkit/WebCore/generated/SVGNames.cpp +++ b/src/3rdparty/webkit/WebCore/generated/SVGNames.cpp @@ -58,29 +58,6 @@ DEFINE_GLOBAL(QualifiedName, definition_srcTag, nullAtom, "definition_src", svgN DEFINE_GLOBAL(QualifiedName, defsTag, nullAtom, "defs", svgNamespaceURI); DEFINE_GLOBAL(QualifiedName, descTag, nullAtom, "desc", svgNamespaceURI); DEFINE_GLOBAL(QualifiedName, ellipseTag, nullAtom, "ellipse", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feBlendTag, nullAtom, "feBlend", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feColorMatrixTag, nullAtom, "feColorMatrix", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feComponentTransferTag, nullAtom, "feComponentTransfer", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feCompositeTag, nullAtom, "feComposite", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feDiffuseLightingTag, nullAtom, "feDiffuseLighting", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feDisplacementMapTag, nullAtom, "feDisplacementMap", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feDistantLightTag, nullAtom, "feDistantLight", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feFloodTag, nullAtom, "feFlood", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feFuncATag, nullAtom, "feFuncA", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feFuncBTag, nullAtom, "feFuncB", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feFuncGTag, nullAtom, "feFuncG", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feFuncRTag, nullAtom, "feFuncR", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feGaussianBlurTag, nullAtom, "feGaussianBlur", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feImageTag, nullAtom, "feImage", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feMergeTag, nullAtom, "feMerge", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feMergeNodeTag, nullAtom, "feMergeNode", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feOffsetTag, nullAtom, "feOffset", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, fePointLightTag, nullAtom, "fePointLight", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feSpecularLightingTag, nullAtom, "feSpecularLighting", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feSpotLightTag, nullAtom, "feSpotLight", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feTileTag, nullAtom, "feTile", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, feTurbulenceTag, nullAtom, "feTurbulence", svgNamespaceURI); -DEFINE_GLOBAL(QualifiedName, filterTag, nullAtom, "filter", svgNamespaceURI); DEFINE_GLOBAL(QualifiedName, fontTag, nullAtom, "font", svgNamespaceURI); DEFINE_GLOBAL(QualifiedName, font_faceTag, nullAtom, "font_face", svgNamespaceURI); DEFINE_GLOBAL(QualifiedName, font_face_formatTag, nullAtom, "font_face_format", svgNamespaceURI); @@ -137,29 +114,6 @@ WebCore::QualifiedName** getSVGTags(size_t* size) (WebCore::QualifiedName*)&defsTag, (WebCore::QualifiedName*)&descTag, (WebCore::QualifiedName*)&ellipseTag, - (WebCore::QualifiedName*)&feBlendTag, - (WebCore::QualifiedName*)&feColorMatrixTag, - (WebCore::QualifiedName*)&feComponentTransferTag, - (WebCore::QualifiedName*)&feCompositeTag, - (WebCore::QualifiedName*)&feDiffuseLightingTag, - (WebCore::QualifiedName*)&feDisplacementMapTag, - (WebCore::QualifiedName*)&feDistantLightTag, - (WebCore::QualifiedName*)&feFloodTag, - (WebCore::QualifiedName*)&feFuncATag, - (WebCore::QualifiedName*)&feFuncBTag, - (WebCore::QualifiedName*)&feFuncGTag, - (WebCore::QualifiedName*)&feFuncRTag, - (WebCore::QualifiedName*)&feGaussianBlurTag, - (WebCore::QualifiedName*)&feImageTag, - (WebCore::QualifiedName*)&feMergeTag, - (WebCore::QualifiedName*)&feMergeNodeTag, - (WebCore::QualifiedName*)&feOffsetTag, - (WebCore::QualifiedName*)&fePointLightTag, - (WebCore::QualifiedName*)&feSpecularLightingTag, - (WebCore::QualifiedName*)&feSpotLightTag, - (WebCore::QualifiedName*)&feTileTag, - (WebCore::QualifiedName*)&feTurbulenceTag, - (WebCore::QualifiedName*)&filterTag, (WebCore::QualifiedName*)&fontTag, (WebCore::QualifiedName*)&font_faceTag, (WebCore::QualifiedName*)&font_face_formatTag, @@ -199,7 +153,7 @@ WebCore::QualifiedName** getSVGTags(size_t* size) (WebCore::QualifiedName*)&useTag, (WebCore::QualifiedName*)&viewTag, }; - *size = 74; + *size = 51; return SVGTags; } @@ -722,29 +676,6 @@ char definition_srcTagString[] = "definition-src"; char defsTagString[] = "defs"; char descTagString[] = "desc"; char ellipseTagString[] = "ellipse"; -char feBlendTagString[] = "feBlend"; -char feColorMatrixTagString[] = "feColorMatrix"; -char feComponentTransferTagString[] = "feComponentTransfer"; -char feCompositeTagString[] = "feComposite"; -char feDiffuseLightingTagString[] = "feDiffuseLighting"; -char feDisplacementMapTagString[] = "feDisplacementMap"; -char feDistantLightTagString[] = "feDistantLight"; -char feFloodTagString[] = "feFlood"; -char feFuncATagString[] = "feFuncA"; -char feFuncBTagString[] = "feFuncB"; -char feFuncGTagString[] = "feFuncG"; -char feFuncRTagString[] = "feFuncR"; -char feGaussianBlurTagString[] = "feGaussianBlur"; -char feImageTagString[] = "feImage"; -char feMergeTagString[] = "feMerge"; -char feMergeNodeTagString[] = "feMergeNode"; -char feOffsetTagString[] = "feOffset"; -char fePointLightTagString[] = "fePointLight"; -char feSpecularLightingTagString[] = "feSpecularLighting"; -char feSpotLightTagString[] = "feSpotLight"; -char feTileTagString[] = "feTile"; -char feTurbulenceTagString[] = "feTurbulence"; -char filterTagString[] = "filter"; char fontTagString[] = "font"; char font_faceTagString[] = "font-face"; char font_face_formatTagString[] = "font-face-format"; @@ -1062,29 +993,6 @@ void init() new ((void*)&defsTag) QualifiedName(nullAtom, defsTagString, svgNS); new ((void*)&descTag) QualifiedName(nullAtom, descTagString, svgNS); new ((void*)&ellipseTag) QualifiedName(nullAtom, ellipseTagString, svgNS); - new ((void*)&feBlendTag) QualifiedName(nullAtom, feBlendTagString, svgNS); - new ((void*)&feColorMatrixTag) QualifiedName(nullAtom, feColorMatrixTagString, svgNS); - new ((void*)&feComponentTransferTag) QualifiedName(nullAtom, feComponentTransferTagString, svgNS); - new ((void*)&feCompositeTag) QualifiedName(nullAtom, feCompositeTagString, svgNS); - new ((void*)&feDiffuseLightingTag) QualifiedName(nullAtom, feDiffuseLightingTagString, svgNS); - new ((void*)&feDisplacementMapTag) QualifiedName(nullAtom, feDisplacementMapTagString, svgNS); - new ((void*)&feDistantLightTag) QualifiedName(nullAtom, feDistantLightTagString, svgNS); - new ((void*)&feFloodTag) QualifiedName(nullAtom, feFloodTagString, svgNS); - new ((void*)&feFuncATag) QualifiedName(nullAtom, feFuncATagString, svgNS); - new ((void*)&feFuncBTag) QualifiedName(nullAtom, feFuncBTagString, svgNS); - new ((void*)&feFuncGTag) QualifiedName(nullAtom, feFuncGTagString, svgNS); - new ((void*)&feFuncRTag) QualifiedName(nullAtom, feFuncRTagString, svgNS); - new ((void*)&feGaussianBlurTag) QualifiedName(nullAtom, feGaussianBlurTagString, svgNS); - new ((void*)&feImageTag) QualifiedName(nullAtom, feImageTagString, svgNS); - new ((void*)&feMergeTag) QualifiedName(nullAtom, feMergeTagString, svgNS); - new ((void*)&feMergeNodeTag) QualifiedName(nullAtom, feMergeNodeTagString, svgNS); - new ((void*)&feOffsetTag) QualifiedName(nullAtom, feOffsetTagString, svgNS); - new ((void*)&fePointLightTag) QualifiedName(nullAtom, fePointLightTagString, svgNS); - new ((void*)&feSpecularLightingTag) QualifiedName(nullAtom, feSpecularLightingTagString, svgNS); - new ((void*)&feSpotLightTag) QualifiedName(nullAtom, feSpotLightTagString, svgNS); - new ((void*)&feTileTag) QualifiedName(nullAtom, feTileTagString, svgNS); - new ((void*)&feTurbulenceTag) QualifiedName(nullAtom, feTurbulenceTagString, svgNS); - new ((void*)&filterTag) QualifiedName(nullAtom, filterTagString, svgNS); new ((void*)&fontTag) QualifiedName(nullAtom, fontTagString, svgNS); new ((void*)&font_faceTag) QualifiedName(nullAtom, font_faceTagString, svgNS); new ((void*)&font_face_formatTag) QualifiedName(nullAtom, font_face_formatTagString, svgNS); diff --git a/src/3rdparty/webkit/WebCore/generated/SVGNames.h b/src/3rdparty/webkit/WebCore/generated/SVGNames.h index d7121d58d7..89703ff18d 100644 --- a/src/3rdparty/webkit/WebCore/generated/SVGNames.h +++ b/src/3rdparty/webkit/WebCore/generated/SVGNames.h @@ -67,52 +67,6 @@ extern const WebCore::QualifiedName descTag; extern char descTagString[]; extern const WebCore::QualifiedName ellipseTag; extern char ellipseTagString[]; -extern const WebCore::QualifiedName feBlendTag; -extern char feBlendTagString[]; -extern const WebCore::QualifiedName feColorMatrixTag; -extern char feColorMatrixTagString[]; -extern const WebCore::QualifiedName feComponentTransferTag; -extern char feComponentTransferTagString[]; -extern const WebCore::QualifiedName feCompositeTag; -extern char feCompositeTagString[]; -extern const WebCore::QualifiedName feDiffuseLightingTag; -extern char feDiffuseLightingTagString[]; -extern const WebCore::QualifiedName feDisplacementMapTag; -extern char feDisplacementMapTagString[]; -extern const WebCore::QualifiedName feDistantLightTag; -extern char feDistantLightTagString[]; -extern const WebCore::QualifiedName feFloodTag; -extern char feFloodTagString[]; -extern const WebCore::QualifiedName feFuncATag; -extern char feFuncATagString[]; -extern const WebCore::QualifiedName feFuncBTag; -extern char feFuncBTagString[]; -extern const WebCore::QualifiedName feFuncGTag; -extern char feFuncGTagString[]; -extern const WebCore::QualifiedName feFuncRTag; -extern char feFuncRTagString[]; -extern const WebCore::QualifiedName feGaussianBlurTag; -extern char feGaussianBlurTagString[]; -extern const WebCore::QualifiedName feImageTag; -extern char feImageTagString[]; -extern const WebCore::QualifiedName feMergeTag; -extern char feMergeTagString[]; -extern const WebCore::QualifiedName feMergeNodeTag; -extern char feMergeNodeTagString[]; -extern const WebCore::QualifiedName feOffsetTag; -extern char feOffsetTagString[]; -extern const WebCore::QualifiedName fePointLightTag; -extern char fePointLightTagString[]; -extern const WebCore::QualifiedName feSpecularLightingTag; -extern char feSpecularLightingTagString[]; -extern const WebCore::QualifiedName feSpotLightTag; -extern char feSpotLightTagString[]; -extern const WebCore::QualifiedName feTileTag; -extern char feTileTagString[]; -extern const WebCore::QualifiedName feTurbulenceTag; -extern char feTurbulenceTagString[]; -extern const WebCore::QualifiedName filterTag; -extern char filterTagString[]; extern const WebCore::QualifiedName fontTag; extern char fontTagString[]; extern const WebCore::QualifiedName font_faceTag; @@ -189,9 +143,6 @@ extern const WebCore::QualifiedName useTag; extern char useTagString[]; extern const WebCore::QualifiedName viewTag; extern char viewTagString[]; - - -WebCore::QualifiedName** getSVGTags(size_t* size); // Attributes extern const WebCore::QualifiedName accent_heightAttr; extern char accent_heightAttrString[]; @@ -687,11 +638,11 @@ extern const WebCore::QualifiedName zAttr; extern char zAttrString[]; extern const WebCore::QualifiedName zoomAndPanAttr; extern char zoomAndPanAttrString[]; - - -WebCore::QualifiedName** getSVGAttr(size_t* size); #endif +WebCore::QualifiedName** getSVGTags(size_t* size); +WebCore::QualifiedName** getSVGAttrs(size_t* size); + void init(); } } diff --git a/src/3rdparty/webkit/WebCore/generated/StringPrototype.lut.h b/src/3rdparty/webkit/WebCore/generated/StringPrototype.lut.h index b0298a664b..aa044fa33c 100644 --- a/src/3rdparty/webkit/WebCore/generated/StringPrototype.lut.h +++ b/src/3rdparty/webkit/WebCore/generated/StringPrototype.lut.h @@ -41,10 +41,5 @@ static const struct HashTableValue stringTableValues[33] = { }; extern const struct HashTable stringTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 2047, stringTableValues, 0 }; -#else { 71, 63, stringTableValues, 0 }; -#endif - } // namespace diff --git a/src/3rdparty/webkit/WebCore/generated/UserAgentStyleSheets.h b/src/3rdparty/webkit/WebCore/generated/UserAgentStyleSheets.h index c7711fa9da..13f2c11a46 100644 --- a/src/3rdparty/webkit/WebCore/generated/UserAgentStyleSheets.h +++ b/src/3rdparty/webkit/WebCore/generated/UserAgentStyleSheets.h @@ -1,8 +1,8 @@ namespace WebCore { -extern const char html4UserAgentStyleSheet[8200]; +extern const char html4UserAgentStyleSheet[8333]; extern const char quirksUserAgentStyleSheet[359]; extern const char svgUserAgentStyleSheet[358]; extern const char sourceUserAgentStyleSheet[2025]; extern const char wmlUserAgentStyleSheet[2956]; -extern const char mediaControlsUserAgentStyleSheet[1587]; +extern const char mediaControlsUserAgentStyleSheet[1977]; } diff --git a/src/3rdparty/webkit/WebCore/generated/UserAgentStyleSheetsData.cpp b/src/3rdparty/webkit/WebCore/generated/UserAgentStyleSheetsData.cpp index aa2a51eb00..2db412d7ef 100644 --- a/src/3rdparty/webkit/WebCore/generated/UserAgentStyleSheetsData.cpp +++ b/src/3rdparty/webkit/WebCore/generated/UserAgentStyleSheetsData.cpp @@ -1,5 +1,5 @@ namespace WebCore { -extern const char html4UserAgentStyleSheet[8200] = { +extern const char html4UserAgentStyleSheet[8333] = { 110, 97, 109, 101, 115, 112, 97, 99, 101, 32, 34, 104, 116, 116, 112, 58, 47, 47, 119, 119, 119, 46, 119, 51, 46, 111, 114, 103, 47, 49, 57, 57, 57, 47, 120, 104, 116, 109, 108, 34, 59, 32, 104, 116, 109, 108, 32, 123, @@ -255,264 +255,272 @@ extern const char html4UserAgentStyleSheet[8200] = { 107, 105, 116, 45, 98, 111, 120, 45, 111, 114, 105, 101, 110, 116, 58, 32, 118, 101, 114, 116, 105, 99, 97, 108, 59, 32, 114, 101, 115, 105, 122, 101, 58, 32, 97, 117, 116, 111, 59, 32, 99, 117, 114, 115, 111, 114, 58, 32, - 97, 117, 116, 111, 59, 32, 125, 32, 105, 110, 112, 117, 116, 58, 58, 45, - 119, 101, 98, 107, 105, 116, 45, 105, 110, 112, 117, 116, 45, 112, 108, 97, - 99, 101, 104, 111, 108, 100, 101, 114, 32, 123, 32, 99, 111, 108, 111, 114, - 58, 32, 100, 97, 114, 107, 71, 114, 97, 121, 59, 32, 125, 32, 105, 110, - 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 112, 97, 115, 115, 119, 111, - 114, 100, 34, 93, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 116, - 101, 120, 116, 45, 115, 101, 99, 117, 114, 105, 116, 121, 58, 32, 100, 105, - 115, 99, 32, 33, 105, 109, 112, 111, 114, 116, 97, 110, 116, 59, 32, 125, - 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 104, 105, 100, - 100, 101, 110, 34, 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, - 101, 61, 34, 105, 109, 97, 103, 101, 34, 93, 44, 32, 105, 110, 112, 117, - 116, 91, 116, 121, 112, 101, 61, 34, 102, 105, 108, 101, 34, 93, 32, 123, - 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, - 110, 99, 101, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 112, 97, - 100, 100, 105, 110, 103, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, - 98, 97, 99, 107, 103, 114, 111, 117, 110, 100, 45, 99, 111, 108, 111, 114, - 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 98, 111, 114, 100, 101, - 114, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 125, 32, 105, 110, + 97, 117, 116, 111, 59, 32, 112, 97, 100, 100, 105, 110, 103, 58, 32, 50, + 112, 120, 59, 32, 125, 32, 105, 110, 112, 117, 116, 58, 58, 45, 119, 101, + 98, 107, 105, 116, 45, 105, 110, 112, 117, 116, 45, 112, 108, 97, 99, 101, + 104, 111, 108, 100, 101, 114, 44, 32, 105, 115, 105, 110, 100, 101, 120, 58, + 58, 45, 119, 101, 98, 107, 105, 116, 45, 105, 110, 112, 117, 116, 45, 112, + 108, 97, 99, 101, 104, 111, 108, 100, 101, 114, 32, 123, 32, 99, 111, 108, + 111, 114, 58, 32, 100, 97, 114, 107, 71, 114, 97, 121, 59, 32, 125, 32, + 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 112, 97, 115, 115, + 119, 111, 114, 100, 34, 93, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, + 45, 116, 101, 120, 116, 45, 115, 101, 99, 117, 114, 105, 116, 121, 58, 32, + 100, 105, 115, 99, 32, 33, 105, 109, 112, 111, 114, 116, 97, 110, 116, 59, + 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 104, + 105, 100, 100, 101, 110, 34, 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, + 121, 112, 101, 61, 34, 105, 109, 97, 103, 101, 34, 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 102, 105, 108, 101, 34, 93, - 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, 97, - 108, 105, 103, 110, 58, 32, 98, 97, 115, 101, 108, 105, 110, 101, 59, 32, - 116, 101, 120, 116, 45, 97, 108, 105, 103, 110, 58, 32, 115, 116, 97, 114, - 116, 32, 33, 105, 109, 112, 111, 114, 116, 97, 110, 116, 59, 32, 125, 32, - 105, 110, 112, 117, 116, 58, 45, 119, 101, 98, 107, 105, 116, 45, 97, 117, - 116, 111, 102, 105, 108, 108, 32, 123, 32, 98, 97, 99, 107, 103, 114, 111, - 117, 110, 100, 45, 99, 111, 108, 111, 114, 58, 32, 98, 97, 99, 107, 103, - 114, 111, 117, 110, 100, 45, 105, 109, 97, 103, 101, 58, 110, 111, 110, 101, - 32, 33, 105, 109, 112, 111, 114, 116, 97, 110, 116, 59, 32, 125, 32, 105, - 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 97, 100, 105, 111, - 34, 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, - 99, 104, 101, 99, 107, 98, 111, 120, 34, 93, 32, 123, 32, 109, 97, 114, - 103, 105, 110, 58, 32, 51, 112, 120, 32, 48, 46, 53, 101, 120, 59, 32, + 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, + 114, 97, 110, 99, 101, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 112, 97, 100, 100, 105, 110, 103, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 98, 97, 99, 107, 103, 114, 111, 117, 110, 100, 45, 99, 111, 108, 111, 114, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 98, 111, 114, 100, 101, 114, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 125, 32, - 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 98, 117, 116, 116, - 111, 110, 34, 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, - 61, 34, 115, 117, 98, 109, 105, 116, 34, 93, 44, 32, 105, 110, 112, 117, - 116, 91, 116, 121, 112, 101, 61, 34, 114, 101, 115, 101, 116, 34, 93, 44, - 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 102, 105, 108, - 101, 34, 93, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 102, 105, 108, - 101, 45, 117, 112, 108, 111, 97, 100, 45, 98, 117, 116, 116, 111, 110, 32, - 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, - 97, 110, 99, 101, 58, 32, 112, 117, 115, 104, 45, 98, 117, 116, 116, 111, - 110, 59, 32, 119, 104, 105, 116, 101, 45, 115, 112, 97, 99, 101, 58, 32, - 112, 114, 101, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, - 61, 34, 98, 117, 116, 116, 111, 110, 34, 93, 44, 32, 105, 110, 112, 117, - 116, 91, 116, 121, 112, 101, 61, 34, 115, 117, 98, 109, 105, 116, 34, 93, - 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 101, - 115, 101, 116, 34, 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, - 101, 61, 34, 102, 105, 108, 101, 34, 93, 58, 58, 45, 119, 101, 98, 107, - 105, 116, 45, 102, 105, 108, 101, 45, 117, 112, 108, 111, 97, 100, 45, 98, - 117, 116, 116, 111, 110, 44, 32, 98, 117, 116, 116, 111, 110, 32, 123, 32, - 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, 97, 108, 105, 103, - 110, 58, 32, 99, 101, 110, 116, 101, 114, 59, 32, 116, 101, 120, 116, 45, - 97, 108, 105, 103, 110, 58, 32, 99, 101, 110, 116, 101, 114, 59, 32, 99, - 117, 114, 115, 111, 114, 58, 32, 100, 101, 102, 97, 117, 108, 116, 59, 32, - 99, 111, 108, 111, 114, 58, 32, 66, 117, 116, 116, 111, 110, 84, 101, 120, - 116, 59, 32, 112, 97, 100, 100, 105, 110, 103, 58, 32, 50, 112, 120, 32, - 54, 112, 120, 32, 51, 112, 120, 32, 54, 112, 120, 59, 32, 98, 111, 114, - 100, 101, 114, 58, 32, 50, 112, 120, 32, 111, 117, 116, 115, 101, 116, 32, - 66, 117, 116, 116, 111, 110, 70, 97, 99, 101, 59, 32, 98, 97, 99, 107, - 103, 114, 111, 117, 110, 100, 45, 99, 111, 108, 111, 114, 58, 32, 66, 117, - 116, 116, 111, 110, 70, 97, 99, 101, 59, 32, 45, 119, 101, 98, 107, 105, - 116, 45, 98, 111, 120, 45, 115, 105, 122, 105, 110, 103, 58, 32, 98, 111, - 114, 100, 101, 114, 45, 98, 111, 120, 32, 125, 32, 105, 110, 112, 117, 116, - 91, 116, 121, 112, 101, 61, 34, 114, 97, 110, 103, 101, 34, 93, 32, 123, - 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, - 110, 99, 101, 58, 32, 115, 108, 105, 100, 101, 114, 45, 104, 111, 114, 105, - 122, 111, 110, 116, 97, 108, 59, 32, 112, 97, 100, 100, 105, 110, 103, 58, - 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 98, 111, 114, 100, 101, 114, - 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 109, 97, 114, 103, 105, - 110, 58, 32, 50, 112, 120, 59, 32, 125, 32, 105, 110, 112, 117, 116, 91, - 116, 121, 112, 101, 61, 34, 114, 97, 110, 103, 101, 34, 93, 58, 58, 45, - 119, 101, 98, 107, 105, 116, 45, 115, 108, 105, 100, 101, 114, 45, 116, 104, - 117, 109, 98, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, - 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, 115, 108, 105, 100, 101, 114, - 116, 104, 117, 109, 98, 45, 104, 111, 114, 105, 122, 111, 110, 116, 97, 108, - 59, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, - 98, 117, 116, 116, 111, 110, 34, 93, 58, 100, 105, 115, 97, 98, 108, 101, - 100, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 115, - 117, 98, 109, 105, 116, 34, 93, 58, 100, 105, 115, 97, 98, 108, 101, 100, - 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 101, - 115, 101, 116, 34, 93, 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 102, 105, 108, 101, - 34, 93, 58, 100, 105, 115, 97, 98, 108, 101, 100, 58, 58, 45, 119, 101, + 34, 93, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, + 45, 97, 108, 105, 103, 110, 58, 32, 98, 97, 115, 101, 108, 105, 110, 101, + 59, 32, 116, 101, 120, 116, 45, 97, 108, 105, 103, 110, 58, 32, 115, 116, + 97, 114, 116, 32, 33, 105, 109, 112, 111, 114, 116, 97, 110, 116, 59, 32, + 125, 32, 105, 110, 112, 117, 116, 58, 45, 119, 101, 98, 107, 105, 116, 45, + 97, 117, 116, 111, 102, 105, 108, 108, 32, 123, 32, 98, 97, 99, 107, 103, + 114, 111, 117, 110, 100, 45, 99, 111, 108, 111, 114, 58, 32, 98, 97, 99, + 107, 103, 114, 111, 117, 110, 100, 45, 105, 109, 97, 103, 101, 58, 110, 111, + 110, 101, 32, 33, 105, 109, 112, 111, 114, 116, 97, 110, 116, 59, 32, 125, + 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 97, 100, + 105, 111, 34, 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, + 61, 34, 99, 104, 101, 99, 107, 98, 111, 120, 34, 93, 32, 123, 32, 109, + 97, 114, 103, 105, 110, 58, 32, 51, 112, 120, 32, 48, 46, 53, 101, 120, + 59, 32, 112, 97, 100, 100, 105, 110, 103, 58, 32, 105, 110, 105, 116, 105, + 97, 108, 59, 32, 98, 97, 99, 107, 103, 114, 111, 117, 110, 100, 45, 99, + 111, 108, 111, 114, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 98, + 111, 114, 100, 101, 114, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, + 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 98, 117, + 116, 116, 111, 110, 34, 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, + 112, 101, 61, 34, 115, 117, 98, 109, 105, 116, 34, 93, 44, 32, 105, 110, + 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 101, 115, 101, 116, 34, + 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 102, + 105, 108, 101, 34, 93, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 102, + 105, 108, 101, 45, 117, 112, 108, 111, 97, 100, 45, 98, 117, 116, 116, 111, + 110, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, + 97, 114, 97, 110, 99, 101, 58, 32, 112, 117, 115, 104, 45, 98, 117, 116, + 116, 111, 110, 59, 32, 119, 104, 105, 116, 101, 45, 115, 112, 97, 99, 101, + 58, 32, 112, 114, 101, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, + 112, 101, 61, 34, 98, 117, 116, 116, 111, 110, 34, 93, 44, 32, 105, 110, + 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 115, 117, 98, 109, 105, 116, + 34, 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, + 114, 101, 115, 101, 116, 34, 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, + 121, 112, 101, 61, 34, 102, 105, 108, 101, 34, 93, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 102, 105, 108, 101, 45, 117, 112, 108, 111, 97, 100, - 45, 98, 117, 116, 116, 111, 110, 44, 32, 98, 117, 116, 116, 111, 110, 58, - 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 115, 101, 108, 101, 99, 116, - 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 107, 101, 121, 103, 101, - 110, 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 111, 112, 116, 103, - 114, 111, 117, 112, 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 111, - 112, 116, 105, 111, 110, 58, 100, 105, 115, 97, 98, 108, 101, 100, 32, 123, - 32, 99, 111, 108, 111, 114, 58, 32, 71, 114, 97, 121, 84, 101, 120, 116, - 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 98, - 117, 116, 116, 111, 110, 34, 93, 58, 97, 99, 116, 105, 118, 101, 44, 32, - 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 115, 117, 98, 109, - 105, 116, 34, 93, 58, 97, 99, 116, 105, 118, 101, 44, 32, 105, 110, 112, - 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 101, 115, 101, 116, 34, 93, - 58, 97, 99, 116, 105, 118, 101, 44, 32, 105, 110, 112, 117, 116, 91, 116, - 121, 112, 101, 61, 34, 102, 105, 108, 101, 34, 93, 58, 97, 99, 116, 105, - 118, 101, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 102, 105, 108, 101, - 45, 117, 112, 108, 111, 97, 100, 45, 98, 117, 116, 116, 111, 110, 44, 32, - 98, 117, 116, 116, 111, 110, 58, 97, 99, 116, 105, 118, 101, 32, 123, 32, - 98, 111, 114, 100, 101, 114, 45, 115, 116, 121, 108, 101, 58, 32, 105, 110, - 115, 101, 116, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, - 61, 34, 98, 117, 116, 116, 111, 110, 34, 93, 58, 97, 99, 116, 105, 118, - 101, 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 105, 110, 112, 117, - 116, 91, 116, 121, 112, 101, 61, 34, 115, 117, 98, 109, 105, 116, 34, 93, - 58, 97, 99, 116, 105, 118, 101, 58, 100, 105, 115, 97, 98, 108, 101, 100, - 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 101, - 115, 101, 116, 34, 93, 58, 97, 99, 116, 105, 118, 101, 58, 100, 105, 115, - 97, 98, 108, 101, 100, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, - 101, 61, 34, 102, 105, 108, 101, 34, 93, 58, 97, 99, 116, 105, 118, 101, - 58, 100, 105, 115, 97, 98, 108, 101, 100, 58, 58, 45, 119, 101, 98, 107, - 105, 116, 45, 102, 105, 108, 101, 45, 117, 112, 108, 111, 97, 100, 45, 98, - 117, 116, 116, 111, 110, 44, 32, 98, 117, 116, 116, 111, 110, 58, 97, 99, - 116, 105, 118, 101, 58, 100, 105, 115, 97, 98, 108, 101, 100, 32, 123, 32, - 98, 111, 114, 100, 101, 114, 45, 115, 116, 121, 108, 101, 58, 32, 111, 117, - 116, 115, 101, 116, 32, 125, 32, 97, 114, 101, 97, 44, 32, 112, 97, 114, - 97, 109, 32, 123, 32, 100, 105, 115, 112, 108, 97, 121, 58, 32, 110, 111, - 110, 101, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, - 34, 99, 104, 101, 99, 107, 98, 111, 120, 34, 93, 32, 123, 32, 45, 119, - 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, - 58, 32, 99, 104, 101, 99, 107, 98, 111, 120, 59, 32, 45, 119, 101, 98, + 45, 98, 117, 116, 116, 111, 110, 44, 32, 98, 117, 116, 116, 111, 110, 32, + 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, 97, 108, + 105, 103, 110, 58, 32, 99, 101, 110, 116, 101, 114, 59, 32, 116, 101, 120, + 116, 45, 97, 108, 105, 103, 110, 58, 32, 99, 101, 110, 116, 101, 114, 59, + 32, 99, 117, 114, 115, 111, 114, 58, 32, 100, 101, 102, 97, 117, 108, 116, + 59, 32, 99, 111, 108, 111, 114, 58, 32, 66, 117, 116, 116, 111, 110, 84, + 101, 120, 116, 59, 32, 112, 97, 100, 100, 105, 110, 103, 58, 32, 50, 112, + 120, 32, 54, 112, 120, 32, 51, 112, 120, 32, 54, 112, 120, 59, 32, 98, + 111, 114, 100, 101, 114, 58, 32, 50, 112, 120, 32, 111, 117, 116, 115, 101, + 116, 32, 66, 117, 116, 116, 111, 110, 70, 97, 99, 101, 59, 32, 98, 97, + 99, 107, 103, 114, 111, 117, 110, 100, 45, 99, 111, 108, 111, 114, 58, 32, + 66, 117, 116, 116, 111, 110, 70, 97, 99, 101, 59, 32, 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, 115, 105, 122, 105, 110, 103, 58, 32, - 98, 111, 114, 100, 101, 114, 45, 98, 111, 120, 59, 32, 125, 32, 105, 110, - 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 97, 100, 105, 111, 34, - 93, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, - 97, 114, 97, 110, 99, 101, 58, 32, 114, 97, 100, 105, 111, 59, 32, 45, - 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, 115, 105, 122, 105, 110, - 103, 58, 32, 98, 111, 114, 100, 101, 114, 45, 98, 111, 120, 59, 32, 125, - 32, 107, 101, 121, 103, 101, 110, 44, 32, 115, 101, 108, 101, 99, 116, 32, - 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, - 97, 110, 99, 101, 58, 32, 109, 101, 110, 117, 108, 105, 115, 116, 59, 32, - 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, 115, 105, 122, 105, - 110, 103, 58, 32, 98, 111, 114, 100, 101, 114, 45, 98, 111, 120, 59, 32, - 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, 97, 108, 105, 103, - 110, 58, 32, 99, 101, 110, 116, 101, 114, 59, 32, 98, 111, 114, 100, 101, - 114, 58, 32, 49, 112, 120, 32, 115, 111, 108, 105, 100, 59, 32, 45, 119, - 101, 98, 107, 105, 116, 45, 98, 111, 114, 100, 101, 114, 45, 114, 97, 100, - 105, 117, 115, 58, 32, 53, 112, 120, 59, 32, 119, 104, 105, 116, 101, 45, - 115, 112, 97, 99, 101, 58, 32, 112, 114, 101, 59, 32, 45, 119, 101, 98, - 107, 105, 116, 45, 114, 116, 108, 45, 111, 114, 100, 101, 114, 105, 110, 103, - 58, 32, 108, 111, 103, 105, 99, 97, 108, 59, 32, 99, 111, 108, 111, 114, - 58, 32, 98, 108, 97, 99, 107, 59, 32, 98, 97, 99, 107, 103, 114, 111, - 117, 110, 100, 45, 99, 111, 108, 111, 114, 58, 32, 119, 104, 105, 116, 101, - 59, 32, 99, 117, 114, 115, 111, 114, 58, 32, 100, 101, 102, 97, 117, 108, - 116, 59, 32, 125, 32, 115, 101, 108, 101, 99, 116, 91, 115, 105, 122, 101, - 93, 44, 32, 115, 101, 108, 101, 99, 116, 91, 109, 117, 108, 116, 105, 112, - 108, 101, 93, 44, 32, 115, 101, 108, 101, 99, 116, 91, 115, 105, 122, 101, - 93, 91, 109, 117, 108, 116, 105, 112, 108, 101, 93, 32, 123, 32, 45, 119, - 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, - 58, 32, 108, 105, 115, 116, 98, 111, 120, 59, 32, 45, 119, 101, 98, 107, - 105, 116, 45, 98, 111, 120, 45, 97, 108, 105, 103, 110, 58, 32, 115, 116, - 97, 114, 116, 59, 32, 98, 111, 114, 100, 101, 114, 58, 32, 49, 112, 120, - 32, 105, 110, 115, 101, 116, 32, 103, 114, 97, 121, 59, 32, 45, 119, 101, - 98, 107, 105, 116, 45, 98, 111, 114, 100, 101, 114, 45, 114, 97, 100, 105, - 117, 115, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 119, 104, 105, - 116, 101, 45, 115, 112, 97, 99, 101, 58, 32, 105, 110, 105, 116, 105, 97, - 108, 59, 32, 125, 32, 115, 101, 108, 101, 99, 116, 91, 115, 105, 122, 101, - 61, 34, 48, 34, 93, 44, 32, 115, 101, 108, 101, 99, 116, 91, 115, 105, - 122, 101, 61, 34, 49, 34, 93, 32, 123, 32, 45, 119, 101, 98, 107, 105, - 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, 109, 101, - 110, 117, 108, 105, 115, 116, 59, 32, 45, 119, 101, 98, 107, 105, 116, 45, - 98, 111, 120, 45, 97, 108, 105, 103, 110, 58, 32, 99, 101, 110, 116, 101, - 114, 59, 32, 98, 111, 114, 100, 101, 114, 58, 32, 49, 112, 120, 32, 115, - 111, 108, 105, 100, 59, 32, 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, - 114, 100, 101, 114, 45, 114, 97, 100, 105, 117, 115, 58, 32, 53, 112, 120, - 59, 32, 119, 104, 105, 116, 101, 45, 115, 112, 97, 99, 101, 58, 32, 112, - 114, 101, 59, 32, 125, 32, 111, 112, 116, 103, 114, 111, 117, 112, 32, 123, - 32, 102, 111, 110, 116, 45, 119, 101, 105, 103, 104, 116, 58, 32, 98, 111, - 108, 100, 101, 114, 59, 32, 125, 32, 111, 112, 116, 105, 111, 110, 32, 123, - 32, 102, 111, 110, 116, 45, 119, 101, 105, 103, 104, 116, 58, 32, 110, 111, - 114, 109, 97, 108, 59, 32, 125, 32, 117, 44, 32, 105, 110, 115, 32, 123, - 32, 116, 101, 120, 116, 45, 100, 101, 99, 111, 114, 97, 116, 105, 111, 110, - 58, 32, 117, 110, 100, 101, 114, 108, 105, 110, 101, 32, 125, 32, 115, 116, - 114, 111, 110, 103, 44, 32, 98, 32, 123, 32, 102, 111, 110, 116, 45, 119, - 101, 105, 103, 104, 116, 58, 32, 98, 111, 108, 100, 101, 114, 32, 125, 32, - 105, 44, 32, 99, 105, 116, 101, 44, 32, 101, 109, 44, 32, 118, 97, 114, - 44, 32, 97, 100, 100, 114, 101, 115, 115, 32, 123, 32, 102, 111, 110, 116, - 45, 115, 116, 121, 108, 101, 58, 32, 105, 116, 97, 108, 105, 99, 32, 125, - 32, 116, 116, 44, 32, 99, 111, 100, 101, 44, 32, 107, 98, 100, 44, 32, - 115, 97, 109, 112, 32, 123, 32, 102, 111, 110, 116, 45, 102, 97, 109, 105, - 108, 121, 58, 32, 109, 111, 110, 111, 115, 112, 97, 99, 101, 32, 125, 32, - 112, 114, 101, 44, 32, 120, 109, 112, 44, 32, 112, 108, 97, 105, 110, 116, - 101, 120, 116, 44, 32, 108, 105, 115, 116, 105, 110, 103, 32, 123, 32, 100, - 105, 115, 112, 108, 97, 121, 58, 32, 98, 108, 111, 99, 107, 59, 32, 102, - 111, 110, 116, 45, 102, 97, 109, 105, 108, 121, 58, 32, 109, 111, 110, 111, - 115, 112, 97, 99, 101, 59, 32, 119, 104, 105, 116, 101, 45, 115, 112, 97, - 99, 101, 58, 32, 112, 114, 101, 59, 32, 109, 97, 114, 103, 105, 110, 58, - 32, 49, 95, 95, 113, 101, 109, 32, 48, 32, 125, 32, 98, 105, 103, 32, - 123, 32, 102, 111, 110, 116, 45, 115, 105, 122, 101, 58, 32, 108, 97, 114, - 103, 101, 114, 32, 125, 32, 115, 109, 97, 108, 108, 32, 123, 32, 102, 111, - 110, 116, 45, 115, 105, 122, 101, 58, 32, 115, 109, 97, 108, 108, 101, 114, - 32, 125, 32, 115, 44, 32, 115, 116, 114, 105, 107, 101, 44, 32, 100, 101, - 108, 32, 123, 32, 116, 101, 120, 116, 45, 100, 101, 99, 111, 114, 97, 116, - 105, 111, 110, 58, 32, 108, 105, 110, 101, 45, 116, 104, 114, 111, 117, 103, - 104, 32, 125, 32, 115, 117, 98, 32, 123, 32, 118, 101, 114, 116, 105, 99, - 97, 108, 45, 97, 108, 105, 103, 110, 58, 32, 115, 117, 98, 59, 32, 102, - 111, 110, 116, 45, 115, 105, 122, 101, 58, 32, 115, 109, 97, 108, 108, 101, - 114, 32, 125, 32, 115, 117, 112, 32, 123, 32, 118, 101, 114, 116, 105, 99, - 97, 108, 45, 97, 108, 105, 103, 110, 58, 32, 115, 117, 112, 101, 114, 59, + 98, 111, 114, 100, 101, 114, 45, 98, 111, 120, 32, 125, 32, 105, 110, 112, + 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 97, 110, 103, 101, 34, 93, + 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, + 114, 97, 110, 99, 101, 58, 32, 115, 108, 105, 100, 101, 114, 45, 104, 111, + 114, 105, 122, 111, 110, 116, 97, 108, 59, 32, 112, 97, 100, 100, 105, 110, + 103, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 98, 111, 114, 100, + 101, 114, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 109, 97, 114, + 103, 105, 110, 58, 32, 50, 112, 120, 59, 32, 125, 32, 105, 110, 112, 117, + 116, 91, 116, 121, 112, 101, 61, 34, 114, 97, 110, 103, 101, 34, 93, 58, + 58, 45, 119, 101, 98, 107, 105, 116, 45, 115, 108, 105, 100, 101, 114, 45, + 116, 104, 117, 109, 98, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, + 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, 115, 108, 105, 100, + 101, 114, 116, 104, 117, 109, 98, 45, 104, 111, 114, 105, 122, 111, 110, 116, + 97, 108, 59, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, + 61, 34, 98, 117, 116, 116, 111, 110, 34, 93, 58, 100, 105, 115, 97, 98, + 108, 101, 100, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, + 34, 115, 117, 98, 109, 105, 116, 34, 93, 58, 100, 105, 115, 97, 98, 108, + 101, 100, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, + 114, 101, 115, 101, 116, 34, 93, 58, 100, 105, 115, 97, 98, 108, 101, 100, + 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 102, 105, + 108, 101, 34, 93, 58, 100, 105, 115, 97, 98, 108, 101, 100, 58, 58, 45, + 119, 101, 98, 107, 105, 116, 45, 102, 105, 108, 101, 45, 117, 112, 108, 111, + 97, 100, 45, 98, 117, 116, 116, 111, 110, 44, 32, 98, 117, 116, 116, 111, + 110, 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 115, 101, 108, 101, + 99, 116, 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 107, 101, 121, + 103, 101, 110, 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 111, 112, + 116, 103, 114, 111, 117, 112, 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, + 32, 111, 112, 116, 105, 111, 110, 58, 100, 105, 115, 97, 98, 108, 101, 100, + 32, 123, 32, 99, 111, 108, 111, 114, 58, 32, 71, 114, 97, 121, 84, 101, + 120, 116, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, + 34, 98, 117, 116, 116, 111, 110, 34, 93, 58, 97, 99, 116, 105, 118, 101, + 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 115, 117, + 98, 109, 105, 116, 34, 93, 58, 97, 99, 116, 105, 118, 101, 44, 32, 105, + 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 101, 115, 101, 116, + 34, 93, 58, 97, 99, 116, 105, 118, 101, 44, 32, 105, 110, 112, 117, 116, + 91, 116, 121, 112, 101, 61, 34, 102, 105, 108, 101, 34, 93, 58, 97, 99, + 116, 105, 118, 101, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 102, 105, + 108, 101, 45, 117, 112, 108, 111, 97, 100, 45, 98, 117, 116, 116, 111, 110, + 44, 32, 98, 117, 116, 116, 111, 110, 58, 97, 99, 116, 105, 118, 101, 32, + 123, 32, 98, 111, 114, 100, 101, 114, 45, 115, 116, 121, 108, 101, 58, 32, + 105, 110, 115, 101, 116, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, + 112, 101, 61, 34, 98, 117, 116, 116, 111, 110, 34, 93, 58, 97, 99, 116, + 105, 118, 101, 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 105, 110, + 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 115, 117, 98, 109, 105, 116, + 34, 93, 58, 97, 99, 116, 105, 118, 101, 58, 100, 105, 115, 97, 98, 108, + 101, 100, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, + 114, 101, 115, 101, 116, 34, 93, 58, 97, 99, 116, 105, 118, 101, 58, 100, + 105, 115, 97, 98, 108, 101, 100, 44, 32, 105, 110, 112, 117, 116, 91, 116, + 121, 112, 101, 61, 34, 102, 105, 108, 101, 34, 93, 58, 97, 99, 116, 105, + 118, 101, 58, 100, 105, 115, 97, 98, 108, 101, 100, 58, 58, 45, 119, 101, + 98, 107, 105, 116, 45, 102, 105, 108, 101, 45, 117, 112, 108, 111, 97, 100, + 45, 98, 117, 116, 116, 111, 110, 44, 32, 98, 117, 116, 116, 111, 110, 58, + 97, 99, 116, 105, 118, 101, 58, 100, 105, 115, 97, 98, 108, 101, 100, 32, + 123, 32, 98, 111, 114, 100, 101, 114, 45, 115, 116, 121, 108, 101, 58, 32, + 111, 117, 116, 115, 101, 116, 32, 125, 32, 97, 114, 101, 97, 44, 32, 112, + 97, 114, 97, 109, 32, 123, 32, 100, 105, 115, 112, 108, 97, 121, 58, 32, + 110, 111, 110, 101, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, + 101, 61, 34, 99, 104, 101, 99, 107, 98, 111, 120, 34, 93, 32, 123, 32, + 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, + 99, 101, 58, 32, 99, 104, 101, 99, 107, 98, 111, 120, 59, 32, 45, 119, + 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, 115, 105, 122, 105, 110, 103, + 58, 32, 98, 111, 114, 100, 101, 114, 45, 98, 111, 120, 59, 32, 125, 32, + 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 97, 100, 105, + 111, 34, 93, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, + 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, 114, 97, 100, 105, 111, 59, + 32, 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, 115, 105, 122, + 105, 110, 103, 58, 32, 98, 111, 114, 100, 101, 114, 45, 98, 111, 120, 59, + 32, 125, 32, 107, 101, 121, 103, 101, 110, 44, 32, 115, 101, 108, 101, 99, + 116, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, + 97, 114, 97, 110, 99, 101, 58, 32, 109, 101, 110, 117, 108, 105, 115, 116, + 59, 32, 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, 115, 105, + 122, 105, 110, 103, 58, 32, 98, 111, 114, 100, 101, 114, 45, 98, 111, 120, + 59, 32, 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, 97, 108, + 105, 103, 110, 58, 32, 99, 101, 110, 116, 101, 114, 59, 32, 98, 111, 114, + 100, 101, 114, 58, 32, 49, 112, 120, 32, 115, 111, 108, 105, 100, 59, 32, + 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, 114, 100, 101, 114, 45, 114, + 97, 100, 105, 117, 115, 58, 32, 53, 112, 120, 59, 32, 119, 104, 105, 116, + 101, 45, 115, 112, 97, 99, 101, 58, 32, 112, 114, 101, 59, 32, 45, 119, + 101, 98, 107, 105, 116, 45, 114, 116, 108, 45, 111, 114, 100, 101, 114, 105, + 110, 103, 58, 32, 108, 111, 103, 105, 99, 97, 108, 59, 32, 99, 111, 108, + 111, 114, 58, 32, 98, 108, 97, 99, 107, 59, 32, 98, 97, 99, 107, 103, + 114, 111, 117, 110, 100, 45, 99, 111, 108, 111, 114, 58, 32, 119, 104, 105, + 116, 101, 59, 32, 99, 117, 114, 115, 111, 114, 58, 32, 100, 101, 102, 97, + 117, 108, 116, 59, 32, 125, 32, 115, 101, 108, 101, 99, 116, 91, 115, 105, + 122, 101, 93, 44, 32, 115, 101, 108, 101, 99, 116, 91, 109, 117, 108, 116, + 105, 112, 108, 101, 93, 44, 32, 115, 101, 108, 101, 99, 116, 91, 115, 105, + 122, 101, 93, 91, 109, 117, 108, 116, 105, 112, 108, 101, 93, 32, 123, 32, + 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, + 99, 101, 58, 32, 108, 105, 115, 116, 98, 111, 120, 59, 32, 45, 119, 101, + 98, 107, 105, 116, 45, 98, 111, 120, 45, 97, 108, 105, 103, 110, 58, 32, + 115, 116, 97, 114, 116, 59, 32, 98, 111, 114, 100, 101, 114, 58, 32, 49, + 112, 120, 32, 105, 110, 115, 101, 116, 32, 103, 114, 97, 121, 59, 32, 45, + 119, 101, 98, 107, 105, 116, 45, 98, 111, 114, 100, 101, 114, 45, 114, 97, + 100, 105, 117, 115, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 119, + 104, 105, 116, 101, 45, 115, 112, 97, 99, 101, 58, 32, 105, 110, 105, 116, + 105, 97, 108, 59, 32, 125, 32, 115, 101, 108, 101, 99, 116, 91, 115, 105, + 122, 101, 61, 34, 48, 34, 93, 44, 32, 115, 101, 108, 101, 99, 116, 91, + 115, 105, 122, 101, 61, 34, 49, 34, 93, 32, 123, 32, 45, 119, 101, 98, + 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, + 109, 101, 110, 117, 108, 105, 115, 116, 59, 32, 45, 119, 101, 98, 107, 105, + 116, 45, 98, 111, 120, 45, 97, 108, 105, 103, 110, 58, 32, 99, 101, 110, + 116, 101, 114, 59, 32, 98, 111, 114, 100, 101, 114, 58, 32, 49, 112, 120, + 32, 115, 111, 108, 105, 100, 59, 32, 45, 119, 101, 98, 107, 105, 116, 45, + 98, 111, 114, 100, 101, 114, 45, 114, 97, 100, 105, 117, 115, 58, 32, 53, + 112, 120, 59, 32, 119, 104, 105, 116, 101, 45, 115, 112, 97, 99, 101, 58, + 32, 112, 114, 101, 59, 32, 125, 32, 111, 112, 116, 103, 114, 111, 117, 112, + 32, 123, 32, 102, 111, 110, 116, 45, 119, 101, 105, 103, 104, 116, 58, 32, + 98, 111, 108, 100, 101, 114, 59, 32, 125, 32, 111, 112, 116, 105, 111, 110, + 32, 123, 32, 102, 111, 110, 116, 45, 119, 101, 105, 103, 104, 116, 58, 32, + 110, 111, 114, 109, 97, 108, 59, 32, 125, 32, 117, 44, 32, 105, 110, 115, + 32, 123, 32, 116, 101, 120, 116, 45, 100, 101, 99, 111, 114, 97, 116, 105, + 111, 110, 58, 32, 117, 110, 100, 101, 114, 108, 105, 110, 101, 32, 125, 32, + 115, 116, 114, 111, 110, 103, 44, 32, 98, 32, 123, 32, 102, 111, 110, 116, + 45, 119, 101, 105, 103, 104, 116, 58, 32, 98, 111, 108, 100, 101, 114, 32, + 125, 32, 105, 44, 32, 99, 105, 116, 101, 44, 32, 101, 109, 44, 32, 118, + 97, 114, 44, 32, 97, 100, 100, 114, 101, 115, 115, 32, 123, 32, 102, 111, + 110, 116, 45, 115, 116, 121, 108, 101, 58, 32, 105, 116, 97, 108, 105, 99, + 32, 125, 32, 116, 116, 44, 32, 99, 111, 100, 101, 44, 32, 107, 98, 100, + 44, 32, 115, 97, 109, 112, 32, 123, 32, 102, 111, 110, 116, 45, 102, 97, + 109, 105, 108, 121, 58, 32, 109, 111, 110, 111, 115, 112, 97, 99, 101, 32, + 125, 32, 112, 114, 101, 44, 32, 120, 109, 112, 44, 32, 112, 108, 97, 105, + 110, 116, 101, 120, 116, 44, 32, 108, 105, 115, 116, 105, 110, 103, 32, 123, + 32, 100, 105, 115, 112, 108, 97, 121, 58, 32, 98, 108, 111, 99, 107, 59, + 32, 102, 111, 110, 116, 45, 102, 97, 109, 105, 108, 121, 58, 32, 109, 111, + 110, 111, 115, 112, 97, 99, 101, 59, 32, 119, 104, 105, 116, 101, 45, 115, + 112, 97, 99, 101, 58, 32, 112, 114, 101, 59, 32, 109, 97, 114, 103, 105, + 110, 58, 32, 49, 95, 95, 113, 101, 109, 32, 48, 32, 125, 32, 98, 105, + 103, 32, 123, 32, 102, 111, 110, 116, 45, 115, 105, 122, 101, 58, 32, 108, + 97, 114, 103, 101, 114, 32, 125, 32, 115, 109, 97, 108, 108, 32, 123, 32, + 102, 111, 110, 116, 45, 115, 105, 122, 101, 58, 32, 115, 109, 97, 108, 108, + 101, 114, 32, 125, 32, 115, 44, 32, 115, 116, 114, 105, 107, 101, 44, 32, + 100, 101, 108, 32, 123, 32, 116, 101, 120, 116, 45, 100, 101, 99, 111, 114, + 97, 116, 105, 111, 110, 58, 32, 108, 105, 110, 101, 45, 116, 104, 114, 111, + 117, 103, 104, 32, 125, 32, 115, 117, 98, 32, 123, 32, 118, 101, 114, 116, + 105, 99, 97, 108, 45, 97, 108, 105, 103, 110, 58, 32, 115, 117, 98, 59, 32, 102, 111, 110, 116, 45, 115, 105, 122, 101, 58, 32, 115, 109, 97, 108, - 108, 101, 114, 32, 125, 32, 110, 111, 98, 114, 32, 123, 32, 119, 104, 105, - 116, 101, 45, 115, 112, 97, 99, 101, 58, 32, 110, 111, 119, 114, 97, 112, - 32, 125, 32, 58, 102, 111, 99, 117, 115, 32, 123, 32, 111, 117, 116, 108, - 105, 110, 101, 58, 32, 97, 117, 116, 111, 32, 53, 112, 120, 32, 45, 119, - 101, 98, 107, 105, 116, 45, 102, 111, 99, 117, 115, 45, 114, 105, 110, 103, - 45, 99, 111, 108, 111, 114, 32, 125, 32, 104, 116, 109, 108, 58, 102, 111, - 99, 117, 115, 44, 32, 98, 111, 100, 121, 58, 102, 111, 99, 117, 115, 44, - 32, 105, 110, 112, 117, 116, 91, 114, 101, 97, 100, 111, 110, 108, 121, 93, - 58, 102, 111, 99, 117, 115, 32, 123, 32, 111, 117, 116, 108, 105, 110, 101, - 58, 32, 110, 111, 110, 101, 32, 125, 32, 105, 110, 112, 117, 116, 58, 102, - 111, 99, 117, 115, 44, 32, 116, 101, 120, 116, 97, 114, 101, 97, 58, 102, - 111, 99, 117, 115, 44, 32, 105, 115, 105, 110, 100, 101, 120, 58, 102, 111, - 99, 117, 115, 44, 32, 107, 101, 121, 103, 101, 110, 58, 102, 111, 99, 117, - 115, 44, 32, 115, 101, 108, 101, 99, 116, 58, 102, 111, 99, 117, 115, 32, - 123, 32, 111, 117, 116, 108, 105, 110, 101, 45, 111, 102, 102, 115, 101, 116, - 58, 32, 45, 50, 112, 120, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, - 121, 112, 101, 61, 34, 98, 117, 116, 116, 111, 110, 34, 93, 58, 102, 111, + 108, 101, 114, 32, 125, 32, 115, 117, 112, 32, 123, 32, 118, 101, 114, 116, + 105, 99, 97, 108, 45, 97, 108, 105, 103, 110, 58, 32, 115, 117, 112, 101, + 114, 59, 32, 102, 111, 110, 116, 45, 115, 105, 122, 101, 58, 32, 115, 109, + 97, 108, 108, 101, 114, 32, 125, 32, 110, 111, 98, 114, 32, 123, 32, 119, + 104, 105, 116, 101, 45, 115, 112, 97, 99, 101, 58, 32, 110, 111, 119, 114, + 97, 112, 32, 125, 32, 58, 102, 111, 99, 117, 115, 32, 123, 32, 111, 117, + 116, 108, 105, 110, 101, 58, 32, 97, 117, 116, 111, 32, 53, 112, 120, 32, + 45, 119, 101, 98, 107, 105, 116, 45, 102, 111, 99, 117, 115, 45, 114, 105, + 110, 103, 45, 99, 111, 108, 111, 114, 32, 125, 32, 104, 116, 109, 108, 58, + 102, 111, 99, 117, 115, 44, 32, 98, 111, 100, 121, 58, 102, 111, 99, 117, + 115, 44, 32, 105, 110, 112, 117, 116, 91, 114, 101, 97, 100, 111, 110, 108, + 121, 93, 58, 102, 111, 99, 117, 115, 32, 123, 32, 111, 117, 116, 108, 105, + 110, 101, 58, 32, 110, 111, 110, 101, 32, 125, 32, 105, 110, 112, 117, 116, + 58, 102, 111, 99, 117, 115, 44, 32, 116, 101, 120, 116, 97, 114, 101, 97, + 58, 102, 111, 99, 117, 115, 44, 32, 105, 115, 105, 110, 100, 101, 120, 58, + 102, 111, 99, 117, 115, 44, 32, 107, 101, 121, 103, 101, 110, 58, 102, 111, + 99, 117, 115, 44, 32, 115, 101, 108, 101, 99, 116, 58, 102, 111, 99, 117, + 115, 32, 123, 32, 111, 117, 116, 108, 105, 110, 101, 45, 111, 102, 102, 115, + 101, 116, 58, 32, 45, 50, 112, 120, 32, 125, 32, 105, 110, 112, 117, 116, + 91, 116, 121, 112, 101, 61, 34, 98, 117, 116, 116, 111, 110, 34, 93, 58, + 102, 111, 99, 117, 115, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, + 101, 61, 34, 99, 104, 101, 99, 107, 98, 111, 120, 34, 93, 58, 102, 111, 99, 117, 115, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, - 34, 99, 104, 101, 99, 107, 98, 111, 120, 34, 93, 58, 102, 111, 99, 117, - 115, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 102, - 105, 108, 101, 34, 93, 58, 102, 111, 99, 117, 115, 44, 32, 105, 110, 112, - 117, 116, 91, 116, 121, 112, 101, 61, 34, 104, 105, 100, 100, 101, 110, 34, - 93, 58, 102, 111, 99, 117, 115, 44, 32, 105, 110, 112, 117, 116, 91, 116, - 121, 112, 101, 61, 34, 105, 109, 97, 103, 101, 34, 93, 58, 102, 111, 99, - 117, 115, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, - 114, 97, 100, 105, 111, 34, 93, 58, 102, 111, 99, 117, 115, 44, 32, 105, - 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 101, 115, 101, 116, - 34, 93, 58, 102, 111, 99, 117, 115, 44, 32, 105, 110, 112, 117, 116, 91, - 116, 121, 112, 101, 61, 34, 115, 101, 97, 114, 99, 104, 34, 93, 58, 102, + 34, 102, 105, 108, 101, 34, 93, 58, 102, 111, 99, 117, 115, 44, 32, 105, + 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 104, 105, 100, 100, 101, + 110, 34, 93, 58, 102, 111, 99, 117, 115, 44, 32, 105, 110, 112, 117, 116, + 91, 116, 121, 112, 101, 61, 34, 105, 109, 97, 103, 101, 34, 93, 58, 102, 111, 99, 117, 115, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, - 61, 34, 115, 117, 98, 109, 105, 116, 34, 93, 58, 102, 111, 99, 117, 115, - 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 102, 105, - 108, 101, 34, 93, 58, 102, 111, 99, 117, 115, 58, 58, 45, 119, 101, 98, - 107, 105, 116, 45, 102, 105, 108, 101, 45, 117, 112, 108, 111, 97, 100, 45, - 98, 117, 116, 116, 111, 110, 32, 123, 32, 111, 117, 116, 108, 105, 110, 101, - 45, 111, 102, 102, 115, 101, 116, 58, 32, 48, 32, 125, 32, 97, 58, 45, - 119, 101, 98, 107, 105, 116, 45, 97, 110, 121, 45, 108, 105, 110, 107, 32, - 123, 32, 99, 111, 108, 111, 114, 58, 32, 45, 119, 101, 98, 107, 105, 116, - 45, 108, 105, 110, 107, 59, 32, 116, 101, 120, 116, 45, 100, 101, 99, 111, - 114, 97, 116, 105, 111, 110, 58, 32, 117, 110, 100, 101, 114, 108, 105, 110, - 101, 59, 32, 99, 117, 114, 115, 111, 114, 58, 32, 97, 117, 116, 111, 59, - 32, 125, 32, 97, 58, 45, 119, 101, 98, 107, 105, 116, 45, 97, 110, 121, - 45, 108, 105, 110, 107, 58, 97, 99, 116, 105, 118, 101, 32, 123, 32, 99, - 111, 108, 111, 114, 58, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 99, - 116, 105, 118, 101, 108, 105, 110, 107, 32, 125, 32, 110, 111, 102, 114, 97, - 109, 101, 115, 32, 123, 32, 100, 105, 115, 112, 108, 97, 121, 58, 32, 110, - 111, 110, 101, 32, 125, 32, 102, 114, 97, 109, 101, 115, 101, 116, 44, 32, - 102, 114, 97, 109, 101, 32, 123, 32, 100, 105, 115, 112, 108, 97, 121, 58, - 32, 98, 108, 111, 99, 107, 32, 125, 32, 102, 114, 97, 109, 101, 115, 101, - 116, 32, 123, 32, 98, 111, 114, 100, 101, 114, 45, 99, 111, 108, 111, 114, - 58, 32, 105, 110, 104, 101, 114, 105, 116, 32, 125, 32, 105, 102, 114, 97, - 109, 101, 32, 123, 32, 98, 111, 114, 100, 101, 114, 58, 32, 50, 112, 120, - 32, 105, 110, 115, 101, 116, 32, 125 + 61, 34, 114, 97, 100, 105, 111, 34, 93, 58, 102, 111, 99, 117, 115, 44, + 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 101, 115, + 101, 116, 34, 93, 58, 102, 111, 99, 117, 115, 44, 32, 105, 110, 112, 117, + 116, 91, 116, 121, 112, 101, 61, 34, 115, 101, 97, 114, 99, 104, 34, 93, + 58, 102, 111, 99, 117, 115, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, + 112, 101, 61, 34, 115, 117, 98, 109, 105, 116, 34, 93, 58, 102, 111, 99, + 117, 115, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, + 102, 105, 108, 101, 34, 93, 58, 102, 111, 99, 117, 115, 58, 58, 45, 119, + 101, 98, 107, 105, 116, 45, 102, 105, 108, 101, 45, 117, 112, 108, 111, 97, + 100, 45, 98, 117, 116, 116, 111, 110, 32, 123, 32, 111, 117, 116, 108, 105, + 110, 101, 45, 111, 102, 102, 115, 101, 116, 58, 32, 48, 32, 125, 32, 97, + 58, 45, 119, 101, 98, 107, 105, 116, 45, 97, 110, 121, 45, 108, 105, 110, + 107, 32, 123, 32, 99, 111, 108, 111, 114, 58, 32, 45, 119, 101, 98, 107, + 105, 116, 45, 108, 105, 110, 107, 59, 32, 116, 101, 120, 116, 45, 100, 101, + 99, 111, 114, 97, 116, 105, 111, 110, 58, 32, 117, 110, 100, 101, 114, 108, + 105, 110, 101, 59, 32, 99, 117, 114, 115, 111, 114, 58, 32, 97, 117, 116, + 111, 59, 32, 125, 32, 97, 58, 45, 119, 101, 98, 107, 105, 116, 45, 97, + 110, 121, 45, 108, 105, 110, 107, 58, 97, 99, 116, 105, 118, 101, 32, 123, + 32, 99, 111, 108, 111, 114, 58, 32, 45, 119, 101, 98, 107, 105, 116, 45, + 97, 99, 116, 105, 118, 101, 108, 105, 110, 107, 32, 125, 32, 110, 111, 102, + 114, 97, 109, 101, 115, 32, 123, 32, 100, 105, 115, 112, 108, 97, 121, 58, + 32, 110, 111, 110, 101, 32, 125, 32, 102, 114, 97, 109, 101, 115, 101, 116, + 44, 32, 102, 114, 97, 109, 101, 32, 123, 32, 100, 105, 115, 112, 108, 97, + 121, 58, 32, 98, 108, 111, 99, 107, 32, 125, 32, 102, 114, 97, 109, 101, + 115, 101, 116, 32, 123, 32, 98, 111, 114, 100, 101, 114, 45, 99, 111, 108, + 111, 114, 58, 32, 105, 110, 104, 101, 114, 105, 116, 32, 125, 32, 105, 102, + 114, 97, 109, 101, 32, 123, 32, 98, 111, 114, 100, 101, 114, 58, 32, 50, + 112, 120, 32, 105, 110, 115, 101, 116, 32, 125, 32, 105, 109, 103, 44, 32, + 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 105, 109, 97, 103, 101, + 93, 44, 32, 118, 105, 100, 101, 111, 44, 32, 105, 102, 114, 97, 109, 101, + 44, 32, 111, 98, 106, 101, 99, 116, 44, 32, 101, 109, 98, 101, 100, 44, + 32, 97, 112, 112, 108, 101, 116, 32, 123, 32, 111, 118, 101, 114, 102, 108, + 111, 119, 58, 32, 104, 105, 100, 100, 101, 110, 59, 32, 125 }; extern const char quirksUserAgentStyleSheet[359] = { 105, 109, 103, 91, 97, 108, 105, 103, 110, 61, 34, 108, 101, 102, 116, 34, @@ -880,7 +888,7 @@ extern const char wmlUserAgentStyleSheet[2956] = { 32, 99, 111, 108, 111, 114, 58, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 99, 116, 105, 118, 101, 108, 105, 110, 107, 32, 125 }; -extern const char mediaControlsUserAgentStyleSheet[1587] = { +extern const char mediaControlsUserAgentStyleSheet[1977] = { 97, 117, 100, 105, 111, 32, 123, 32, 119, 105, 100, 116, 104, 58, 32, 50, 48, 48, 112, 120, 59, 32, 104, 101, 105, 103, 104, 116, 58, 32, 49, 54, 112, 120, 59, 32, 125, 32, 97, 117, 100, 105, 111, 58, 58, 45, 119, 101, @@ -893,93 +901,117 @@ extern const char mediaControlsUserAgentStyleSheet[1587] = { 119, 105, 100, 116, 104, 58, 32, 49, 48, 48, 37, 59, 32, 104, 101, 105, 103, 104, 116, 58, 32, 49, 48, 48, 37, 59, 32, 45, 119, 101, 98, 107, 105, 116, 45, 117, 115, 101, 114, 45, 115, 101, 108, 101, 99, 116, 58, 32, - 110, 111, 110, 101, 59, 32, 125, 32, 118, 105, 100, 101, 111, 58, 45, 119, - 101, 98, 107, 105, 116, 45, 102, 117, 108, 108, 45, 112, 97, 103, 101, 45, - 109, 101, 100, 105, 97, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 109, - 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, 112, 97, - 110, 101, 108, 32, 123, 32, 98, 111, 116, 116, 111, 109, 58, 32, 45, 49, - 54, 112, 120, 59, 32, 125, 32, 97, 117, 100, 105, 111, 58, 58, 45, 119, - 101, 98, 107, 105, 116, 45, 109, 101, 100, 105, 97, 45, 99, 111, 110, 116, - 114, 111, 108, 115, 45, 109, 117, 116, 101, 45, 98, 117, 116, 116, 111, 110, - 44, 32, 118, 105, 100, 101, 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, - 45, 109, 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, - 109, 117, 116, 101, 45, 98, 117, 116, 116, 111, 110, 32, 123, 32, 45, 119, - 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, - 58, 32, 109, 101, 100, 105, 97, 45, 109, 117, 116, 101, 45, 98, 117, 116, - 116, 111, 110, 59, 32, 112, 111, 115, 105, 116, 105, 111, 110, 58, 32, 97, - 98, 115, 111, 108, 117, 116, 101, 59, 32, 116, 111, 112, 58, 32, 97, 117, - 116, 111, 59, 32, 98, 111, 116, 116, 111, 109, 58, 32, 48, 59, 32, 108, - 101, 102, 116, 58, 32, 48, 59, 32, 119, 105, 100, 116, 104, 58, 32, 49, - 55, 112, 120, 59, 32, 104, 101, 105, 103, 104, 116, 58, 32, 49, 54, 112, - 120, 59, 32, 125, 32, 97, 117, 100, 105, 111, 58, 58, 45, 119, 101, 98, - 107, 105, 116, 45, 109, 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, 111, - 108, 115, 45, 112, 108, 97, 121, 45, 98, 117, 116, 116, 111, 110, 44, 32, - 118, 105, 100, 101, 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 109, - 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, 112, 108, - 97, 121, 45, 98, 117, 116, 116, 111, 110, 32, 123, 32, 45, 119, 101, 98, - 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, - 109, 101, 100, 105, 97, 45, 112, 108, 97, 121, 45, 98, 117, 116, 116, 111, - 110, 59, 32, 112, 111, 115, 105, 116, 105, 111, 110, 58, 32, 97, 98, 115, - 111, 108, 117, 116, 101, 59, 32, 116, 111, 112, 58, 32, 97, 117, 116, 111, - 59, 32, 98, 111, 116, 116, 111, 109, 58, 32, 48, 59, 32, 108, 101, 102, - 116, 58, 32, 49, 54, 112, 120, 59, 32, 119, 105, 100, 116, 104, 58, 32, - 49, 55, 112, 120, 59, 32, 104, 101, 105, 103, 104, 116, 58, 32, 49, 54, - 112, 120, 59, 32, 125, 32, 97, 117, 100, 105, 111, 58, 58, 45, 119, 101, - 98, 107, 105, 116, 45, 109, 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, - 111, 108, 115, 45, 116, 105, 109, 101, 45, 100, 105, 115, 112, 108, 97, 121, - 44, 32, 118, 105, 100, 101, 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, + 110, 111, 110, 101, 59, 32, 122, 45, 105, 110, 100, 101, 120, 58, 32, 48, + 59, 32, 125, 32, 118, 105, 100, 101, 111, 58, 45, 119, 101, 98, 107, 105, + 116, 45, 102, 117, 108, 108, 45, 112, 97, 103, 101, 45, 109, 101, 100, 105, + 97, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 109, 101, 100, 105, 97, + 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, 112, 97, 110, 101, 108, 32, + 123, 32, 98, 111, 116, 116, 111, 109, 58, 32, 45, 49, 54, 112, 120, 59, + 32, 125, 32, 97, 117, 100, 105, 111, 58, 58, 45, 119, 101, 98, 107, 105, + 116, 45, 109, 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, 115, + 45, 109, 117, 116, 101, 45, 98, 117, 116, 116, 111, 110, 44, 32, 118, 105, + 100, 101, 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 109, 101, 100, + 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, 109, 117, 116, 101, + 45, 98, 117, 116, 116, 111, 110, 32, 123, 32, 45, 119, 101, 98, 107, 105, + 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, 109, 101, + 100, 105, 97, 45, 109, 117, 116, 101, 45, 98, 117, 116, 116, 111, 110, 59, + 32, 112, 111, 115, 105, 116, 105, 111, 110, 58, 32, 97, 98, 115, 111, 108, + 117, 116, 101, 59, 32, 116, 111, 112, 58, 32, 97, 117, 116, 111, 59, 32, + 98, 111, 116, 116, 111, 109, 58, 32, 48, 59, 32, 108, 101, 102, 116, 58, + 32, 48, 59, 32, 119, 105, 100, 116, 104, 58, 32, 49, 55, 112, 120, 59, + 32, 104, 101, 105, 103, 104, 116, 58, 32, 49, 54, 112, 120, 59, 32, 125, + 32, 97, 117, 100, 105, 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, + 109, 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, 112, + 108, 97, 121, 45, 98, 117, 116, 116, 111, 110, 44, 32, 118, 105, 100, 101, + 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 109, 101, 100, 105, 97, + 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, 112, 108, 97, 121, 45, 98, + 117, 116, 116, 111, 110, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, + 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, 109, 101, 100, 105, + 97, 45, 112, 108, 97, 121, 45, 98, 117, 116, 116, 111, 110, 59, 32, 112, + 111, 115, 105, 116, 105, 111, 110, 58, 32, 97, 98, 115, 111, 108, 117, 116, + 101, 59, 32, 116, 111, 112, 58, 32, 97, 117, 116, 111, 59, 32, 98, 111, + 116, 116, 111, 109, 58, 32, 48, 59, 32, 108, 101, 102, 116, 58, 32, 49, + 54, 112, 120, 59, 32, 119, 105, 100, 116, 104, 58, 32, 49, 55, 112, 120, + 59, 32, 104, 101, 105, 103, 104, 116, 58, 32, 49, 54, 112, 120, 59, 32, + 125, 32, 97, 117, 100, 105, 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 109, 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, - 116, 105, 109, 101, 45, 100, 105, 115, 112, 108, 97, 121, 32, 123, 32, 100, - 105, 115, 112, 108, 97, 121, 58, 32, 110, 111, 110, 101, 59, 32, 125, 32, + 116, 105, 109, 101, 108, 105, 110, 101, 45, 99, 111, 110, 116, 97, 105, 110, + 101, 114, 44, 32, 118, 105, 100, 101, 111, 58, 58, 45, 119, 101, 98, 107, + 105, 116, 45, 109, 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, + 115, 45, 116, 105, 109, 101, 108, 105, 110, 101, 45, 99, 111, 110, 116, 97, + 105, 110, 101, 114, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 117, + 115, 101, 114, 45, 115, 101, 108, 101, 99, 116, 58, 32, 110, 111, 110, 101, + 59, 32, 112, 111, 115, 105, 116, 105, 111, 110, 58, 32, 97, 98, 115, 111, + 108, 117, 116, 101, 59, 32, 112, 97, 100, 100, 105, 110, 103, 58, 32, 48, + 112, 120, 32, 49, 54, 112, 120, 32, 48, 112, 120, 32, 48, 112, 120, 59, + 32, 116, 111, 112, 58, 32, 97, 117, 116, 111, 59, 32, 98, 111, 116, 116, + 111, 109, 58, 32, 48, 59, 32, 108, 101, 102, 116, 58, 32, 51, 50, 112, + 120, 59, 32, 114, 105, 103, 104, 116, 58, 32, 51, 50, 112, 120, 59, 32, + 104, 101, 105, 103, 104, 116, 58, 32, 49, 54, 112, 120, 59, 32, 125, 32, 97, 117, 100, 105, 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 109, + 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, 99, 117, + 114, 114, 101, 110, 116, 45, 116, 105, 109, 101, 45, 100, 105, 115, 112, 108, + 97, 121, 44, 32, 118, 105, 100, 101, 111, 58, 58, 45, 119, 101, 98, 107, + 105, 116, 45, 109, 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, + 115, 45, 99, 117, 114, 114, 101, 110, 116, 45, 116, 105, 109, 101, 45, 100, + 105, 115, 112, 108, 97, 121, 32, 123, 32, 100, 105, 115, 112, 108, 97, 121, + 58, 32, 110, 111, 110, 101, 59, 32, 125, 32, 97, 117, 100, 105, 111, 58, + 58, 45, 119, 101, 98, 107, 105, 116, 45, 109, 101, 100, 105, 97, 45, 99, + 111, 110, 116, 114, 111, 108, 115, 45, 116, 105, 109, 101, 45, 114, 101, 109, + 97, 105, 110, 105, 110, 103, 45, 100, 105, 115, 112, 108, 97, 121, 44, 32, + 118, 105, 100, 101, 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 109, 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, 116, 105, - 109, 101, 108, 105, 110, 101, 44, 32, 118, 105, 100, 101, 111, 58, 58, 45, - 119, 101, 98, 107, 105, 116, 45, 109, 101, 100, 105, 97, 45, 99, 111, 110, - 116, 114, 111, 108, 115, 45, 116, 105, 109, 101, 108, 105, 110, 101, 32, 123, - 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, - 110, 99, 101, 58, 32, 109, 101, 100, 105, 97, 45, 115, 108, 105, 100, 101, - 114, 59, 32, 112, 111, 115, 105, 116, 105, 111, 110, 58, 32, 97, 98, 115, - 111, 108, 117, 116, 101, 59, 32, 116, 111, 112, 58, 32, 97, 117, 116, 111, - 59, 32, 98, 111, 116, 116, 111, 109, 58, 32, 48, 59, 32, 108, 101, 102, - 116, 58, 32, 51, 50, 112, 120, 59, 32, 114, 105, 103, 104, 116, 58, 32, - 51, 50, 112, 120, 59, 32, 104, 101, 105, 103, 104, 116, 58, 32, 49, 54, - 112, 120, 59, 32, 112, 97, 100, 100, 105, 110, 103, 58, 32, 48, 112, 120, - 32, 50, 112, 120, 59, 32, 125, 32, 97, 117, 100, 105, 111, 58, 58, 45, + 109, 101, 45, 114, 101, 109, 97, 105, 110, 105, 110, 103, 45, 100, 105, 115, + 112, 108, 97, 121, 32, 123, 32, 100, 105, 115, 112, 108, 97, 121, 58, 32, + 110, 111, 110, 101, 59, 32, 125, 32, 97, 117, 100, 105, 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 109, 101, 100, 105, 97, 45, 99, 111, 110, - 116, 114, 111, 108, 115, 45, 115, 101, 101, 107, 45, 98, 97, 99, 107, 45, - 98, 117, 116, 116, 111, 110, 44, 32, 118, 105, 100, 101, 111, 58, 58, 45, - 119, 101, 98, 107, 105, 116, 45, 109, 101, 100, 105, 97, 45, 99, 111, 110, - 116, 114, 111, 108, 115, 45, 115, 101, 101, 107, 45, 98, 97, 99, 107, 45, - 98, 117, 116, 116, 111, 110, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, + 116, 114, 111, 108, 115, 45, 116, 105, 109, 101, 108, 105, 110, 101, 44, 32, + 118, 105, 100, 101, 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 109, + 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, 116, 105, + 109, 101, 108, 105, 110, 101, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, 109, 101, 100, - 105, 97, 45, 115, 101, 101, 107, 45, 98, 97, 99, 107, 45, 98, 117, 116, + 105, 97, 45, 115, 108, 105, 100, 101, 114, 59, 32, 112, 111, 115, 105, 116, + 105, 111, 110, 58, 32, 97, 98, 115, 111, 108, 117, 116, 101, 59, 32, 116, + 111, 112, 58, 32, 97, 117, 116, 111, 59, 32, 98, 111, 116, 116, 111, 109, + 58, 32, 48, 59, 32, 108, 101, 102, 116, 58, 32, 48, 112, 120, 59, 32, + 114, 105, 103, 104, 116, 58, 32, 48, 112, 120, 59, 32, 104, 101, 105, 103, + 104, 116, 58, 32, 49, 54, 112, 120, 59, 32, 112, 97, 100, 100, 105, 110, + 103, 58, 32, 48, 112, 120, 32, 50, 112, 120, 59, 32, 125, 32, 97, 117, + 100, 105, 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 109, 101, 100, + 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, 115, 101, 101, 107, + 45, 98, 97, 99, 107, 45, 98, 117, 116, 116, 111, 110, 44, 32, 118, 105, + 100, 101, 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 109, 101, 100, + 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, 115, 101, 101, 107, + 45, 98, 97, 99, 107, 45, 98, 117, 116, 116, 111, 110, 32, 123, 32, 45, + 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, + 101, 58, 32, 109, 101, 100, 105, 97, 45, 115, 101, 101, 107, 45, 98, 97, + 99, 107, 45, 98, 117, 116, 116, 111, 110, 59, 32, 112, 111, 115, 105, 116, + 105, 111, 110, 58, 32, 97, 98, 115, 111, 108, 117, 116, 101, 59, 32, 116, + 111, 112, 58, 32, 97, 117, 116, 111, 59, 32, 98, 111, 116, 116, 111, 109, + 58, 32, 48, 59, 32, 114, 105, 103, 104, 116, 58, 32, 49, 54, 112, 120, + 59, 32, 119, 105, 100, 116, 104, 58, 32, 49, 55, 112, 120, 59, 32, 104, + 101, 105, 103, 104, 116, 58, 32, 49, 54, 112, 120, 59, 32, 125, 32, 97, + 117, 100, 105, 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 109, 101, + 100, 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, 115, 101, 101, + 107, 45, 102, 111, 114, 119, 97, 114, 100, 45, 98, 117, 116, 116, 111, 110, + 44, 32, 118, 105, 100, 101, 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, + 45, 109, 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, + 115, 101, 101, 107, 45, 102, 111, 114, 119, 97, 114, 100, 45, 98, 117, 116, + 116, 111, 110, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, + 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, 109, 101, 100, 105, 97, 45, + 115, 101, 101, 107, 45, 102, 111, 114, 119, 97, 114, 100, 45, 98, 117, 116, 116, 111, 110, 59, 32, 112, 111, 115, 105, 116, 105, 111, 110, 58, 32, 97, 98, 115, 111, 108, 117, 116, 101, 59, 32, 116, 111, 112, 58, 32, 97, 117, 116, 111, 59, 32, 98, 111, 116, 116, 111, 109, 58, 32, 48, 59, 32, 114, - 105, 103, 104, 116, 58, 32, 49, 54, 112, 120, 59, 32, 119, 105, 100, 116, - 104, 58, 32, 49, 55, 112, 120, 59, 32, 104, 101, 105, 103, 104, 116, 58, - 32, 49, 54, 112, 120, 59, 32, 125, 32, 97, 117, 100, 105, 111, 58, 58, - 45, 119, 101, 98, 107, 105, 116, 45, 109, 101, 100, 105, 97, 45, 99, 111, - 110, 116, 114, 111, 108, 115, 45, 115, 101, 101, 107, 45, 102, 111, 114, 119, - 97, 114, 100, 45, 98, 117, 116, 116, 111, 110, 44, 32, 118, 105, 100, 101, - 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 109, 101, 100, 105, 97, - 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, 115, 101, 101, 107, 45, 102, - 111, 114, 119, 97, 114, 100, 45, 98, 117, 116, 116, 111, 110, 32, 123, 32, - 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, - 99, 101, 58, 32, 109, 101, 100, 105, 97, 45, 115, 101, 101, 107, 45, 102, - 111, 114, 119, 97, 114, 100, 45, 98, 117, 116, 116, 111, 110, 59, 32, 112, - 111, 115, 105, 116, 105, 111, 110, 58, 32, 97, 98, 115, 111, 108, 117, 116, - 101, 59, 32, 116, 111, 112, 58, 32, 97, 117, 116, 111, 59, 32, 98, 111, - 116, 116, 111, 109, 58, 32, 48, 59, 32, 114, 105, 103, 104, 116, 58, 32, - 48, 59, 32, 119, 105, 100, 116, 104, 58, 32, 49, 55, 112, 120, 59, 32, - 104, 101, 105, 103, 104, 116, 58, 32, 49, 54, 112, 120, 59, 32, 125, 32, - 97, 117, 100, 105, 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 109, - 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, 102, 117, - 108, 108, 115, 99, 114, 101, 101, 110, 45, 98, 117, 116, 116, 111, 110, 44, - 32, 118, 105, 100, 101, 111, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, - 109, 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, 111, 108, 115, 45, 102, - 117, 108, 108, 115, 99, 114, 101, 101, 110, 45, 98, 117, 116, 116, 111, 110, - 32, 123, 32, 100, 105, 115, 112, 108, 97, 121, 58, 32, 110, 111, 110, 101, - 59, 32, 125 + 105, 103, 104, 116, 58, 32, 48, 59, 32, 119, 105, 100, 116, 104, 58, 32, + 49, 55, 112, 120, 59, 32, 104, 101, 105, 103, 104, 116, 58, 32, 49, 54, + 112, 120, 59, 32, 125, 32, 97, 117, 100, 105, 111, 58, 58, 45, 119, 101, + 98, 107, 105, 116, 45, 109, 101, 100, 105, 97, 45, 99, 111, 110, 116, 114, + 111, 108, 115, 45, 102, 117, 108, 108, 115, 99, 114, 101, 101, 110, 45, 98, + 117, 116, 116, 111, 110, 44, 32, 118, 105, 100, 101, 111, 58, 58, 45, 119, + 101, 98, 107, 105, 116, 45, 109, 101, 100, 105, 97, 45, 99, 111, 110, 116, + 114, 111, 108, 115, 45, 102, 117, 108, 108, 115, 99, 114, 101, 101, 110, 45, + 98, 117, 116, 116, 111, 110, 32, 123, 32, 100, 105, 115, 112, 108, 97, 121, + 58, 32, 110, 111, 110, 101, 59, 32, 125 }; } diff --git a/src/3rdparty/webkit/WebCore/generated/XLinkNames.h b/src/3rdparty/webkit/WebCore/generated/XLinkNames.h index 3e796c53b7..9a9cb29dbf 100644 --- a/src/3rdparty/webkit/WebCore/generated/XLinkNames.h +++ b/src/3rdparty/webkit/WebCore/generated/XLinkNames.h @@ -55,11 +55,10 @@ extern const WebCore::QualifiedName titleAttr; extern char titleAttrString[]; extern const WebCore::QualifiedName typeAttr; extern char typeAttrString[]; - - -WebCore::QualifiedName** getXLinkAttr(size_t* size); #endif +WebCore::QualifiedName** getXLinkAttrs(size_t* size); + void init(); } } diff --git a/src/3rdparty/webkit/WebCore/generated/XMLNames.h b/src/3rdparty/webkit/WebCore/generated/XMLNames.h index 7f04550e6b..f135e96fea 100644 --- a/src/3rdparty/webkit/WebCore/generated/XMLNames.h +++ b/src/3rdparty/webkit/WebCore/generated/XMLNames.h @@ -44,11 +44,10 @@ extern const WebCore::AtomicString xmlNamespaceURI; extern const WebCore::QualifiedName baseAttr; extern const WebCore::QualifiedName langAttr; extern const WebCore::QualifiedName spaceAttr; - - -WebCore::QualifiedName** getXMLAttr(size_t* size); #endif +WebCore::QualifiedName** getXMLAttrs(size_t* size); + void init(); } } diff --git a/src/3rdparty/webkit/WebCore/generated/XPathGrammar.cpp b/src/3rdparty/webkit/WebCore/generated/XPathGrammar.cpp index 1e67ca6ac2..187298081c 100644 --- a/src/3rdparty/webkit/WebCore/generated/XPathGrammar.cpp +++ b/src/3rdparty/webkit/WebCore/generated/XPathGrammar.cpp @@ -1,24 +1,23 @@ -/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* A Bison parser, made by GNU Bison 2.4.1. */ - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +/* Skeleton implementation for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -29,7 +28,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -47,7 +46,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.3" +#define YYBISON_VERSION "2.4.1" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -55,69 +54,28 @@ /* Pure parsers. */ #define YYPURE 1 +/* Push parsers. */ +#define YYPUSH 0 + +/* Pull parsers. */ +#define YYPULL 1 + /* Using locations. */ #define YYLSP_NEEDED 0 /* Substitute the variable and function names. */ -#define yyparse xpathyyparse -#define yylex xpathyylex -#define yyerror xpathyyerror -#define yylval xpathyylval -#define yychar xpathyychar -#define yydebug xpathyydebug -#define yynerrs xpathyynerrs - - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - MULOP = 258, - RELOP = 259, - EQOP = 260, - MINUS = 261, - PLUS = 262, - AND = 263, - OR = 264, - AXISNAME = 265, - NODETYPE = 266, - PI = 267, - FUNCTIONNAME = 268, - LITERAL = 269, - VARIABLEREFERENCE = 270, - NUMBER = 271, - DOTDOT = 272, - SLASHSLASH = 273, - NAMETEST = 274, - XPATH_ERROR = 275 - }; -#endif -/* Tokens. */ -#define MULOP 258 -#define RELOP 259 -#define EQOP 260 -#define MINUS 261 -#define PLUS 262 -#define AND 263 -#define OR 264 -#define AXISNAME 265 -#define NODETYPE 266 -#define PI 267 -#define FUNCTIONNAME 268 -#define LITERAL 269 -#define VARIABLEREFERENCE 270 -#define NUMBER 271 -#define DOTDOT 272 -#define SLASHSLASH 273 -#define NAMETEST 274 -#define XPATH_ERROR 275 - - +#define yyparse xpathyyparse +#define yylex xpathyylex +#define yyerror xpathyyerror +#define yylval xpathyylval +#define yychar xpathyychar +#define yydebug xpathyydebug +#define yynerrs xpathyynerrs /* Copy the first part of user declarations. */ + +/* Line 189 of yacc.c */ #line 28 "../xml/XPathGrammar.y" @@ -144,6 +102,9 @@ using namespace XPath; +/* Line 189 of yacc.c */ +#line 107 "WebCore/tmp/../generated/XPathGrammar.tab.c" + /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -162,10 +123,43 @@ using namespace XPath; # define YYTOKEN_TABLE 0 #endif + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + MULOP = 258, + RELOP = 259, + EQOP = 260, + MINUS = 261, + PLUS = 262, + AND = 263, + OR = 264, + AXISNAME = 265, + NODETYPE = 266, + PI = 267, + FUNCTIONNAME = 268, + LITERAL = 269, + VARIABLEREFERENCE = 270, + NUMBER = 271, + DOTDOT = 272, + SLASHSLASH = 273, + NAMETEST = 274, + XPATH_ERROR = 275 + }; +#endif + + + #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 56 "../xml/XPathGrammar.y" { + +/* Line 214 of yacc.c */ +#line 56 "../xml/XPathGrammar.y" + Step::Axis axis; Step::NodeTest* nodeTest; NumericOp::Opcode numop; @@ -176,28 +170,31 @@ typedef union YYSTYPE Vector<Expression*>* argList; Step* step; LocationPath* locationPath; -} -/* Line 187 of yacc.c. */ -#line 182 "XPathGrammar.tab.c" - YYSTYPE; + + + +/* Line 214 of yacc.c */ +#line 178 "WebCore/tmp/../generated/XPathGrammar.tab.c" +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif - /* Copy the second part of user declarations. */ + +/* Line 264 of yacc.c */ #line 69 "../xml/XPathGrammar.y" -int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } -void xpathyyerror(const char*) { } +static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } +static void xpathyyerror(const char*) { } -/* Line 216 of yacc.c. */ -#line 201 "XPathGrammar.tab.c" +/* Line 264 of yacc.c */ +#line 198 "WebCore/tmp/../generated/XPathGrammar.tab.c" #ifdef short # undef short @@ -272,14 +269,14 @@ typedef short int yytype_int16; #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static int -YYID (int i) +YYID (int yyi) #else static int -YYID (i) - int i; +YYID (yyi) + int yyi; #endif { - return i; + return yyi; } #endif @@ -360,9 +357,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; - YYSTYPE yyvs; - }; + yytype_int16 yyss_alloc; + YYSTYPE yyvs_alloc; +}; /* The size of the maximum gap between one aligned stack and the next. */ # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) @@ -396,12 +393,12 @@ union yyalloc elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack) \ +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ do \ { \ YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ @@ -854,17 +851,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) +yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) #else static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; +yy_stack_print (yybottom, yytop) + yytype_int16 *yybottom; + yytype_int16 *yytop; #endif { YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } YYFPRINTF (stderr, "\n"); } @@ -898,11 +898,11 @@ yy_reduce_print (yyvsp, yyrule) /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - fprintf (stderr, " $%d = ", yyi + 1); + YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], &(yyvsp[(yyi + 1) - (yynrhs)]) ); - fprintf (stderr, "\n"); + YYFPRINTF (stderr, "\n"); } } @@ -1182,10 +1182,8 @@ yydestruct (yymsg, yytype, yyvaluep) break; } } - /* Prevent warnings from -Wmissing-prototypes. */ - #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus int yyparse (void *YYPARSE_PARAM); @@ -1204,10 +1202,9 @@ int yyparse (); - -/*----------. -| yyparse. | -`----------*/ +/*-------------------------. +| yyparse or yypush_parse. | +`-------------------------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1231,74 +1228,75 @@ yyparse () #endif #endif { - /* The look-ahead symbol. */ +/* The lookahead symbol. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; -/* Number of syntax errors so far. */ -int yynerrs; - - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif - - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ + /* Number of syntax errors so far. */ + int yynerrs; - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; + int yystate; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + /* The stacks and their tools: + `yyss': related to states. + `yyvs': related to semantic values. + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss; + yytype_int16 *yyssp; -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs; + YYSTYPE *yyvsp; - YYSIZE_T yystacksize = YYINITDEPTH; + YYSIZE_T yystacksize; + int yyn; + int yyresult; + /* Lookahead token as an internal (translated) token number. */ + int yytoken; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; + yytoken = 0; + yyss = yyssa; + yyvs = yyvsa; + yystacksize = YYINITDEPTH; + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ + yychar = YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack so that they stay on the same level as the state stack. The wasted elements are never initialized. */ - yyssp = yyss; yyvsp = yyvs; @@ -1328,7 +1326,6 @@ int yynerrs; YYSTYPE *yyvs1 = yyvs; yytype_int16 *yyss1 = yyss; - /* Each stack pointer address is followed by the size of the data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might @@ -1336,7 +1333,6 @@ int yynerrs; yyoverflow (YY_("memory exhausted"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), - &yystacksize); yyss = yyss1; @@ -1359,9 +1355,8 @@ int yynerrs; (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); @@ -1372,7 +1367,6 @@ int yynerrs; yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; - YYDPRINTF ((stderr, "Stack size increased to %lu\n", (unsigned long int) yystacksize)); @@ -1382,6 +1376,9 @@ int yynerrs; YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + if (yystate == YYFINAL) + YYACCEPT; + goto yybackup; /*-----------. @@ -1390,16 +1387,16 @@ int yynerrs; yybackup: /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ + lookahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to look-ahead token. */ + /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -1431,20 +1428,16 @@ yybackup: goto yyreduce; } - if (yyn == YYFINAL) - YYACCEPT; - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; - /* Shift the look-ahead token. */ + /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; + /* Discard the shifted token. */ + yychar = YYEMPTY; yystate = yyn; *++yyvsp = yylval; @@ -1484,6 +1477,8 @@ yyreduce: switch (yyn) { case 2: + +/* Line 1455 of yacc.c */ #line 118 "../xml/XPathGrammar.y" { PARSER->m_topExpr = (yyvsp[(1) - (1)].expr); @@ -1491,6 +1486,8 @@ yyreduce: break; case 3: + +/* Line 1455 of yacc.c */ #line 125 "../xml/XPathGrammar.y" { (yyval.locationPath)->setAbsolute(false); @@ -1498,6 +1495,8 @@ yyreduce: break; case 4: + +/* Line 1455 of yacc.c */ #line 130 "../xml/XPathGrammar.y" { (yyval.locationPath)->setAbsolute(true); @@ -1505,6 +1504,8 @@ yyreduce: break; case 5: + +/* Line 1455 of yacc.c */ #line 137 "../xml/XPathGrammar.y" { (yyval.locationPath) = new LocationPath; @@ -1513,6 +1514,8 @@ yyreduce: break; case 6: + +/* Line 1455 of yacc.c */ #line 143 "../xml/XPathGrammar.y" { (yyval.locationPath) = (yyvsp[(2) - (2)].locationPath); @@ -1520,6 +1523,8 @@ yyreduce: break; case 7: + +/* Line 1455 of yacc.c */ #line 148 "../xml/XPathGrammar.y" { (yyval.locationPath) = (yyvsp[(2) - (2)].locationPath); @@ -1529,6 +1534,8 @@ yyreduce: break; case 8: + +/* Line 1455 of yacc.c */ #line 157 "../xml/XPathGrammar.y" { (yyval.locationPath) = new LocationPath; @@ -1539,6 +1546,8 @@ yyreduce: break; case 9: + +/* Line 1455 of yacc.c */ #line 165 "../xml/XPathGrammar.y" { (yyval.locationPath)->appendStep((yyvsp[(3) - (3)].step)); @@ -1547,6 +1556,8 @@ yyreduce: break; case 10: + +/* Line 1455 of yacc.c */ #line 171 "../xml/XPathGrammar.y" { (yyval.locationPath)->appendStep((yyvsp[(2) - (3)].step)); @@ -1557,6 +1568,8 @@ yyreduce: break; case 11: + +/* Line 1455 of yacc.c */ #line 181 "../xml/XPathGrammar.y" { if ((yyvsp[(2) - (2)].predList)) { @@ -1570,6 +1583,8 @@ yyreduce: break; case 12: + +/* Line 1455 of yacc.c */ #line 192 "../xml/XPathGrammar.y" { String localName; @@ -1590,6 +1605,8 @@ yyreduce: break; case 13: + +/* Line 1455 of yacc.c */ #line 210 "../xml/XPathGrammar.y" { if ((yyvsp[(3) - (3)].predList)) { @@ -1603,6 +1620,8 @@ yyreduce: break; case 14: + +/* Line 1455 of yacc.c */ #line 221 "../xml/XPathGrammar.y" { String localName; @@ -1623,6 +1642,8 @@ yyreduce: break; case 17: + +/* Line 1455 of yacc.c */ #line 245 "../xml/XPathGrammar.y" { (yyval.axis) = Step::AttributeAxis; @@ -1630,6 +1651,8 @@ yyreduce: break; case 18: + +/* Line 1455 of yacc.c */ #line 252 "../xml/XPathGrammar.y" { if (*(yyvsp[(1) - (3)].str) == "node") @@ -1645,6 +1668,8 @@ yyreduce: break; case 19: + +/* Line 1455 of yacc.c */ #line 265 "../xml/XPathGrammar.y" { (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); @@ -1654,6 +1679,8 @@ yyreduce: break; case 20: + +/* Line 1455 of yacc.c */ #line 272 "../xml/XPathGrammar.y" { (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, (yyvsp[(3) - (4)].str)->stripWhiteSpace()); @@ -1664,6 +1691,8 @@ yyreduce: break; case 21: + +/* Line 1455 of yacc.c */ #line 282 "../xml/XPathGrammar.y" { (yyval.predList) = 0; @@ -1671,6 +1700,8 @@ yyreduce: break; case 23: + +/* Line 1455 of yacc.c */ #line 291 "../xml/XPathGrammar.y" { (yyval.predList) = new Vector<Predicate*>; @@ -1681,6 +1712,8 @@ yyreduce: break; case 24: + +/* Line 1455 of yacc.c */ #line 299 "../xml/XPathGrammar.y" { (yyval.predList)->append(new Predicate((yyvsp[(2) - (2)].expr))); @@ -1689,6 +1722,8 @@ yyreduce: break; case 25: + +/* Line 1455 of yacc.c */ #line 307 "../xml/XPathGrammar.y" { (yyval.expr) = (yyvsp[(2) - (3)].expr); @@ -1696,6 +1731,8 @@ yyreduce: break; case 26: + +/* Line 1455 of yacc.c */ #line 314 "../xml/XPathGrammar.y" { (yyval.step) = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); @@ -1704,6 +1741,8 @@ yyreduce: break; case 27: + +/* Line 1455 of yacc.c */ #line 322 "../xml/XPathGrammar.y" { (yyval.step) = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); @@ -1712,6 +1751,8 @@ yyreduce: break; case 28: + +/* Line 1455 of yacc.c */ #line 328 "../xml/XPathGrammar.y" { (yyval.step) = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); @@ -1720,6 +1761,8 @@ yyreduce: break; case 29: + +/* Line 1455 of yacc.c */ #line 336 "../xml/XPathGrammar.y" { (yyval.expr) = new VariableReference(*(yyvsp[(1) - (1)].str)); @@ -1729,6 +1772,8 @@ yyreduce: break; case 30: + +/* Line 1455 of yacc.c */ #line 343 "../xml/XPathGrammar.y" { (yyval.expr) = (yyvsp[(2) - (3)].expr); @@ -1736,6 +1781,8 @@ yyreduce: break; case 31: + +/* Line 1455 of yacc.c */ #line 348 "../xml/XPathGrammar.y" { (yyval.expr) = new StringExpression(*(yyvsp[(1) - (1)].str)); @@ -1745,6 +1792,8 @@ yyreduce: break; case 32: + +/* Line 1455 of yacc.c */ #line 355 "../xml/XPathGrammar.y" { (yyval.expr) = new Number((yyvsp[(1) - (1)].str)->toDouble()); @@ -1754,6 +1803,8 @@ yyreduce: break; case 34: + +/* Line 1455 of yacc.c */ #line 366 "../xml/XPathGrammar.y" { (yyval.expr) = createFunction(*(yyvsp[(1) - (3)].str)); @@ -1765,6 +1816,8 @@ yyreduce: break; case 35: + +/* Line 1455 of yacc.c */ #line 375 "../xml/XPathGrammar.y" { (yyval.expr) = createFunction(*(yyvsp[(1) - (4)].str), *(yyvsp[(3) - (4)].argList)); @@ -1777,6 +1830,8 @@ yyreduce: break; case 36: + +/* Line 1455 of yacc.c */ #line 387 "../xml/XPathGrammar.y" { (yyval.argList) = new Vector<Expression*>; @@ -1787,6 +1842,8 @@ yyreduce: break; case 37: + +/* Line 1455 of yacc.c */ #line 395 "../xml/XPathGrammar.y" { (yyval.argList)->append((yyvsp[(3) - (3)].expr)); @@ -1795,6 +1852,8 @@ yyreduce: break; case 40: + +/* Line 1455 of yacc.c */ #line 409 "../xml/XPathGrammar.y" { (yyval.expr) = new Union; @@ -1807,6 +1866,8 @@ yyreduce: break; case 41: + +/* Line 1455 of yacc.c */ #line 421 "../xml/XPathGrammar.y" { (yyval.expr) = (yyvsp[(1) - (1)].locationPath); @@ -1814,6 +1875,8 @@ yyreduce: break; case 43: + +/* Line 1455 of yacc.c */ #line 428 "../xml/XPathGrammar.y" { (yyvsp[(3) - (3)].locationPath)->setAbsolute(true); @@ -1825,6 +1888,8 @@ yyreduce: break; case 44: + +/* Line 1455 of yacc.c */ #line 437 "../xml/XPathGrammar.y" { (yyvsp[(3) - (3)].locationPath)->insertFirstStep((yyvsp[(2) - (3)].step)); @@ -1838,6 +1903,8 @@ yyreduce: break; case 46: + +/* Line 1455 of yacc.c */ #line 452 "../xml/XPathGrammar.y" { (yyval.expr) = new Filter((yyvsp[(1) - (2)].expr), *(yyvsp[(2) - (2)].predList)); @@ -1848,6 +1915,8 @@ yyreduce: break; case 48: + +/* Line 1455 of yacc.c */ #line 464 "../xml/XPathGrammar.y" { (yyval.expr) = new LogicalOp(LogicalOp::OP_Or, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); @@ -1858,6 +1927,8 @@ yyreduce: break; case 50: + +/* Line 1455 of yacc.c */ #line 476 "../xml/XPathGrammar.y" { (yyval.expr) = new LogicalOp(LogicalOp::OP_And, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); @@ -1868,6 +1939,8 @@ yyreduce: break; case 52: + +/* Line 1455 of yacc.c */ #line 488 "../xml/XPathGrammar.y" { (yyval.expr) = new EqTestOp((yyvsp[(2) - (3)].eqop), (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); @@ -1878,6 +1951,8 @@ yyreduce: break; case 54: + +/* Line 1455 of yacc.c */ #line 500 "../xml/XPathGrammar.y" { (yyval.expr) = new EqTestOp((yyvsp[(2) - (3)].eqop), (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); @@ -1888,6 +1963,8 @@ yyreduce: break; case 56: + +/* Line 1455 of yacc.c */ #line 512 "../xml/XPathGrammar.y" { (yyval.expr) = new NumericOp(NumericOp::OP_Add, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); @@ -1898,6 +1975,8 @@ yyreduce: break; case 57: + +/* Line 1455 of yacc.c */ #line 520 "../xml/XPathGrammar.y" { (yyval.expr) = new NumericOp(NumericOp::OP_Sub, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); @@ -1908,6 +1987,8 @@ yyreduce: break; case 59: + +/* Line 1455 of yacc.c */ #line 532 "../xml/XPathGrammar.y" { (yyval.expr) = new NumericOp((yyvsp[(2) - (3)].numop), (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); @@ -1918,6 +1999,8 @@ yyreduce: break; case 61: + +/* Line 1455 of yacc.c */ #line 544 "../xml/XPathGrammar.y" { (yyval.expr) = new Negative; @@ -1928,8 +2011,9 @@ yyreduce: break; -/* Line 1267 of yacc.c. */ -#line 1933 "XPathGrammar.tab.c" + +/* Line 1455 of yacc.c */ +#line 2017 "WebCore/tmp/../generated/XPathGrammar.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -1940,7 +2024,6 @@ yyreduce: *++yyvsp = yyval; - /* Now `shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -2005,7 +2088,7 @@ yyerrlab: if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an + /* If just tried and failed to reuse lookahead token after an error, discard it. */ if (yychar <= YYEOF) @@ -2022,7 +2105,7 @@ yyerrlab: } } - /* Else will try to reuse look-ahead token after shifting the error + /* Else will try to reuse lookahead token after shifting the error token. */ goto yyerrlab1; @@ -2079,9 +2162,6 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - *++yyvsp = yylval; @@ -2106,7 +2186,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#ifndef yyoverflow +#if !defined(yyoverflow) || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -2117,7 +2197,7 @@ yyexhaustedlab: #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) + if (yychar != YYEMPTY) yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval); /* Do not reclaim the symbols of the rule which action triggered @@ -2143,6 +2223,8 @@ yyreturn: } + +/* Line 1675 of yacc.c */ #line 552 "../xml/XPathGrammar.y" diff --git a/src/3rdparty/webkit/WebCore/generated/XPathGrammar.h b/src/3rdparty/webkit/WebCore/generated/XPathGrammar.h index cabe35a777..5a974bb910 100644 --- a/src/3rdparty/webkit/WebCore/generated/XPathGrammar.h +++ b/src/3rdparty/webkit/WebCore/generated/XPathGrammar.h @@ -1,24 +1,23 @@ -/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton interface for Bison's Yacc-like parsers in C +/* A Bison parser, made by GNU Bison 2.4.1. */ - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +/* Skeleton interface for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -29,10 +28,11 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ + /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -59,33 +59,16 @@ XPATH_ERROR = 275 }; #endif -/* Tokens. */ -#define MULOP 258 -#define RELOP 259 -#define EQOP 260 -#define MINUS 261 -#define PLUS 262 -#define AND 263 -#define OR 264 -#define AXISNAME 265 -#define NODETYPE 266 -#define PI 267 -#define FUNCTIONNAME 268 -#define LITERAL 269 -#define VARIABLEREFERENCE 270 -#define NUMBER 271 -#define DOTDOT 272 -#define SLASHSLASH 273 -#define NAMETEST 274 -#define XPATH_ERROR 275 - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 56 "../xml/XPathGrammar.y" { + +/* Line 1676 of yacc.c */ +#line 56 "../xml/XPathGrammar.y" + Step::Axis axis; Step::NodeTest* nodeTest; NumericOp::Opcode numop; @@ -96,14 +79,17 @@ typedef union YYSTYPE Vector<Expression*>* argList; Step* step; LocationPath* locationPath; -} -/* Line 1489 of yacc.c. */ -#line 102 "XPathGrammar.tab.h" - YYSTYPE; + + + +/* Line 1676 of yacc.c */ +#line 87 "WebCore/tmp/../generated/XPathGrammar.tab.h" +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif + |