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

Side by Side Diff: include/v8.h

Issue 6664001: [Isolates] Merge (7083,7111] from bleeding_edge. (Closed)
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « MERGE ('k') | src/accessors.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2007-2009 the V8 project authors. All rights reserved. 1 // Copyright 2007-2009 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 1420 matching lines...) Expand 10 before | Expand all | Expand 10 after
1431 DontDelete = 1 << 2 1431 DontDelete = 1 << 2
1432 }; 1432 };
1433 1433
1434 enum ExternalArrayType { 1434 enum ExternalArrayType {
1435 kExternalByteArray = 1, 1435 kExternalByteArray = 1,
1436 kExternalUnsignedByteArray, 1436 kExternalUnsignedByteArray,
1437 kExternalShortArray, 1437 kExternalShortArray,
1438 kExternalUnsignedShortArray, 1438 kExternalUnsignedShortArray,
1439 kExternalIntArray, 1439 kExternalIntArray,
1440 kExternalUnsignedIntArray, 1440 kExternalUnsignedIntArray,
1441 kExternalFloatArray 1441 kExternalFloatArray,
1442 kExternalPixelArray
1442 }; 1443 };
1443 1444
1444 /** 1445 /**
1445 * Accessor[Getter|Setter] are used as callback functions when 1446 * Accessor[Getter|Setter] are used as callback functions when
1446 * setting|getting a particular property. See Object and ObjectTemplate's 1447 * setting|getting a particular property. See Object and ObjectTemplate's
1447 * method SetAccessor. 1448 * method SetAccessor.
1448 */ 1449 */
1449 typedef Handle<Value> (*AccessorGetter)(Local<String> property, 1450 typedef Handle<Value> (*AccessorGetter)(Local<String> property,
1450 const AccessorInfo& info); 1451 const AccessorInfo& info);
1451 1452
(...skipping 2496 matching lines...) Expand 10 before | Expand all | Expand 10 after
3948 3949
3949 3950
3950 } // namespace v8 3951 } // namespace v8
3951 3952
3952 3953
3953 #undef V8EXPORT 3954 #undef V8EXPORT
3954 #undef TYPE_CHECK 3955 #undef TYPE_CHECK
3955 3956
3956 3957
3957 #endif // V8_H_ 3958 #endif // V8_H_
OLDNEW
« no previous file with comments | « MERGE ('k') | src/accessors.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698