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

Side by Side Diff: src/apinatives.js

Issue 253603003: Pass in the prototype to CreateApiFunction rather than setting it on the result. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | src/bootstrapper.cc » ('j') | src/factory.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 function InstantiateFunction(data, name) { 65 function InstantiateFunction(data, name) {
66 // We need a reference to kApiFunctionCache in the stack frame 66 // We need a reference to kApiFunctionCache in the stack frame
67 // if we need to bail out from a stack overflow. 67 // if we need to bail out from a stack overflow.
68 var cache = kApiFunctionCache; 68 var cache = kApiFunctionCache;
69 var serialNumber = %GetTemplateField(data, kApiSerialNumberOffset); 69 var serialNumber = %GetTemplateField(data, kApiSerialNumberOffset);
70 var isFunctionCached = 70 var isFunctionCached =
71 (serialNumber in cache) && (cache[serialNumber] != kUninitialized); 71 (serialNumber in cache) && (cache[serialNumber] != kUninitialized);
72 if (!isFunctionCached) { 72 if (!isFunctionCached) {
73 try { 73 try {
74 var fun = %CreateApiFunction(data);
75 if (name) %FunctionSetName(fun, name);
76 var flags = %GetTemplateField(data, kApiFlagOffset); 74 var flags = %GetTemplateField(data, kApiFlagOffset);
77 var doNotCache = flags & (1 << kDoNotCacheBit); 75 var has_proto = !(flags & (1 << kRemovePrototypeBit));
78 if (!doNotCache) cache[serialNumber] = fun; 76 var prototype;
79 if (flags & (1 << kRemovePrototypeBit)) { 77 if (has_proto) {
80 %FunctionRemovePrototype(fun); 78 var template = %GetTemplateField(data, kApiPrototypeTemplateOffset);
81 } else { 79 prototype = typeof template === 'undefined'
82 var prototype = %GetTemplateField(data, kApiPrototypeTemplateOffset); 80 ? {} : Instantiate(template);
83 // Note: Do not directly use an object template as a condition, our 81
84 // internal ToBoolean doesn't handle that!
85 fun.prototype = typeof prototype === 'undefined' ?
86 {} : Instantiate(prototype);
87 if (flags & (1 << kReadOnlyPrototypeBit)) {
88 %FunctionSetReadOnlyPrototype(fun);
89 }
90 %SetProperty(fun.prototype, "constructor", fun, DONT_ENUM);
91 var parent = %GetTemplateField(data, kApiParentTemplateOffset); 82 var parent = %GetTemplateField(data, kApiParentTemplateOffset);
92 // Note: Do not directly use a function template as a condition, our 83 // Note: Do not directly use a function template as a condition, our
93 // internal ToBoolean doesn't handle that! 84 // internal ToBoolean doesn't handle that!
94 if (!(typeof parent === 'undefined')) { 85 if (typeof parent !== 'undefined') {
95 var parent_fun = Instantiate(parent); 86 var parent_fun = Instantiate(parent);
96 %SetPrototype(fun.prototype, parent_fun.prototype); 87 %SetPrototype(prototype, parent_fun.prototype);
97 } 88 }
98 } 89 }
90 var fun = %CreateApiFunction(data, prototype);
91 if (name) %FunctionSetName(fun, name);
92 var doNotCache = flags & (1 << kDoNotCacheBit);
93 if (!doNotCache) cache[serialNumber] = fun;
94 if (has_proto && flags & (1 << kReadOnlyPrototypeBit)) {
95 %FunctionSetReadOnlyPrototype(fun);
96 }
99 ConfigureTemplateInstance(fun, data); 97 ConfigureTemplateInstance(fun, data);
100 if (doNotCache) return fun; 98 if (doNotCache) return fun;
101 } catch (e) { 99 } catch (e) {
102 cache[serialNumber] = kUninitialized; 100 cache[serialNumber] = kUninitialized;
103 throw e; 101 throw e;
104 } 102 }
105 } 103 }
106 return cache[serialNumber]; 104 return cache[serialNumber];
107 } 105 }
108 106
(...skipping 22 matching lines...) Expand all
131 obj, name, getter, setter, attribute, access_control); 129 obj, name, getter, setter, attribute, access_control);
132 } else { 130 } else {
133 throw "Bad properties array"; 131 throw "Bad properties array";
134 } 132 }
135 i += length + 1; 133 i += length + 1;
136 } 134 }
137 } finally { 135 } finally {
138 if (requires_access_checks) %EnableAccessChecks(obj); 136 if (requires_access_checks) %EnableAccessChecks(obj);
139 } 137 }
140 } 138 }
OLDNEW
« no previous file with comments | « no previous file | src/bootstrapper.cc » ('j') | src/factory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698