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

Side by Side Diff: src/proxy.js

Issue 7109004: Revert "Make instanceof and Object.getPrototypeOf work for proxies, plus a few other tweaks." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 6 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 | « src/objects-inl.h ('k') | src/runtime.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 "constructTrap", 53 "constructTrap",
54 ] 54 ]
55 55
56 $Proxy.createFunction = function(handler, callTrap, constructTrap) { 56 $Proxy.createFunction = function(handler, callTrap, constructTrap) {
57 handler.callTrap = callTrap 57 handler.callTrap = callTrap
58 handler.constructTrap = constructTrap 58 handler.constructTrap = constructTrap
59 $Proxy.create(handler) 59 $Proxy.create(handler)
60 } 60 }
61 61
62 $Proxy.create = function(handler, proto) { 62 $Proxy.create = function(handler, proto) {
63 if (!IS_SPEC_OBJECT(handler)) 63 if (!IS_SPEC_OBJECT(handler)) throw TypeError
64 throw MakeTypeError("handler_non_object", ["create"]) 64 if (!IS_SPEC_OBJECT(proto)) proto = $Object.prototype
65 if (!IS_SPEC_OBJECT(proto)) proto = null // Mozilla does this...
66 return %CreateJSProxy(handler, proto) 65 return %CreateJSProxy(handler, proto)
67 } 66 }
68 67
69 68
70 69
71 70
72 //////////////////////////////////////////////////////////////////////////////// 71 ////////////////////////////////////////////////////////////////////////////////
73 // Builtins 72 // Builtins
74 //////////////////////////////////////////////////////////////////////////////// 73 ////////////////////////////////////////////////////////////////////////////////
75 74
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 } 123 }
125 } 124 }
126 } 125 }
127 this.defineProperty(name, { 126 this.defineProperty(name, {
128 value: val, 127 value: val,
129 writable: true, 128 writable: true,
130 enumerable: true, 129 enumerable: true,
131 configurable: true}); 130 configurable: true});
132 return true; 131 return true;
133 } 132 }
134
135 function DerivedHasTrap(name) {
136 return !!this.getPropertyDescriptor(name)
137 }
OLDNEW
« no previous file with comments | « src/objects-inl.h ('k') | src/runtime.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698