Merge revisions 7030:7051 from bleeding_edge to isolates branch....

src/handles.h

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * 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
@@ skipping 168 matching lines @@
 void FlattenString(Handle<String> str);
 
 // Flattens a string and returns the underlying external or sequential
 // string.
 Handle<String> FlattenGetString(Handle<String> str);
 
 Handle<Object> SetProperty(Handle<JSObject> object,
                            Handle<String> key,
                            Handle<Object> value,
                            PropertyAttributes attributes,
-                           StrictModeFlag strict);
+                           StrictModeFlag strict_mode);
 
 Handle<Object> SetProperty(Handle<Object> object,
                            Handle<Object> key,
                            Handle<Object> value,
                            PropertyAttributes attributes,
-                           StrictModeFlag strict);
+                           StrictModeFlag strict_mode);
 
 Handle<Object> ForceSetProperty(Handle<JSObject> object,
                                 Handle<Object> key,
                                 Handle<Object> value,
                                 PropertyAttributes attributes);
 
 Handle<Object> SetNormalizedProperty(Handle<JSObject> object,
                                      Handle<String> key,
                                      Handle<Object> value,
                                      PropertyDetails details);
@@ skipping 11 matching lines @@
 // and which therefore has no accessors and alikes.
 void SetLocalPropertyNoThrow(Handle<JSObject> object,
                              Handle<String> key,
                              Handle<Object> value,
                              PropertyAttributes attributes = NONE);
 
 Handle<Object> SetPropertyWithInterceptor(Handle<JSObject> object,
                                           Handle<String> key,
                                           Handle<Object> value,
                                           PropertyAttributes attributes,
-                                          StrictModeFlag strict);
+                                          StrictModeFlag strict_mode);
 
 Handle<Object> SetElement(Handle<JSObject> object,
                           uint32_t index,
                           Handle<Object> value);
 
 Handle<Object> SetOwnElement(Handle<JSObject> object,
                              uint32_t index,
                              Handle<Object> value);
 
 Handle<Object> GetProperty(Handle<JSObject> obj,
@@ skipping 139 matching lines @@
  private:
   bool has_been_transformed_;  // Tells whether the object has been transformed.
   int unused_property_fields_;  // Captures the unused number of field.
   Handle<JSObject> object_;    // The object being optimized.
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_HANDLES_H_