Chromium Code Reviews| Index: src/objects.h |
| diff --git a/src/objects.h b/src/objects.h |
| index 3acb16bff6ab84c4051d4515d3de3bdb7b6cb4d0..37fb04adea755ef3c22c933de8adf658cc6f25db 100644 |
| --- a/src/objects.h |
| +++ b/src/objects.h |
| @@ -847,9 +847,6 @@ class Object : public MaybeObject { |
| Object* structure, |
| String* name, |
| Object* holder); |
| - MUST_USE_RESULT MaybeObject* GetPropertyWithHandler(Object* receiver, |
| - String* name, |
| - Object* handler); |
| MUST_USE_RESULT MaybeObject* GetPropertyWithDefinedGetter(Object* receiver, |
| JSFunction* getter); |
| @@ -1388,6 +1385,8 @@ class JSReceiver: public HeapObject { |
| Object* value, |
| PropertyAttributes attributes, |
| StrictModeFlag strict_mode); |
| + MUST_USE_RESULT MaybeObject* SetPropertyWithDefinedSetter(JSFunction* setter, |
| + Object* value); |
| MUST_USE_RESULT MaybeObject* DeleteProperty(String* name, DeleteMode mode); |
| @@ -1543,8 +1542,6 @@ class JSObject: public JSReceiver { |
| Object* value, |
| JSObject* holder, |
| StrictModeFlag strict_mode); |
| - MUST_USE_RESULT MaybeObject* SetPropertyWithDefinedSetter(JSFunction* setter, |
| - Object* value); |
| MUST_USE_RESULT MaybeObject* SetPropertyWithInterceptor( |
| String* name, |
| Object* value, |
| @@ -1773,10 +1770,6 @@ class JSObject: public JSReceiver { |
| inline Object* GetInternalField(int index); |
| inline void SetInternalField(int index, Object* value); |
| - // Lookup a property. If found, the result is valid and has |
| - // detailed information. |
| - void LocalLookup(String* name, LookupResult* result); |
| - |
| // The following lookup functions skip interceptors. |
| void LocalLookupRealNamedProperty(String* name, LookupResult* result); |
| void LookupRealNamedProperty(String* name, LookupResult* result); |
| @@ -6589,6 +6582,10 @@ class JSProxy: public JSReceiver { |
| bool HasPropertyWithHandler(String* name); |
| + MUST_USE_RESULT MaybeObject* GetPropertyWithHandler( |
| + Object* receiver, |
| + String* name); |
| + |
| MUST_USE_RESULT MaybeObject* SetPropertyWithHandler( |
| String* name, |
| Object* value, |
| @@ -6601,8 +6598,7 @@ class JSProxy: public JSReceiver { |
| MUST_USE_RESULT PropertyAttributes GetPropertyAttributeWithHandler( |
| JSReceiver* receiver, |
| - String* name, |
| - bool* has_exception); |
| + String* name); |
| // Turn this into an (empty) JSObject. |
| void Fix(); |
| @@ -6610,6 +6606,12 @@ class JSProxy: public JSReceiver { |
| // Initializes the body after the handler slot. |
| inline void InitializeBody(int object_size, Object* value); |
| + // Invoke a trap by name. If the trap does not exist on this's handler, |
| + // but derived_trap is non-NULL, invoke that instead. May cause GC. |
| + Handle<Object> CallTrap(const char* name, |
| + Object* derived_trap, |
| + int argc, Object*** args); |
|
Kevin Millikin (Chromium)
2011/08/31 10:15:31
We consistently use one line per parameter in decl
rossberg
2011/08/31 13:28:32
Done.
|
| + |
| // Dispatched behavior. |
| #ifdef OBJECT_PRINT |
| inline void JSProxyPrint() { |