Merge arguments branch to bleeding merge.

src/factory.h

 // Copyright 2011 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 133 matching lines @@
 
   // Create a global (but otherwise uninitialized) context.
   Handle<Context> NewGlobalContext();
 
   // Create a function context.
   Handle<Context> NewFunctionContext(int length,
                                      Handle<JSFunction> closure);
 
   // Create a catch context.
   Handle<Context> NewCatchContext(Handle<Context> previous,
-                                  Handle<String> name,
-                                  Handle<Object> thrown_object);
+                                  Handle<JSObject> extension);
 
   // Create a 'with' context.
   Handle<Context> NewWithContext(Handle<Context> previous,
                                  Handle<JSObject> extension);
 
   // Return the Symbol matching the passed in string.
   Handle<String> SymbolFromString(Handle<String> value);
 
   // Allocate a new struct.  The struct is pretenured (allocated directly in
   // the old generation).
@@ skipping 276 matching lines @@
   // Update the map cache in the global context with (keys, map)
   Handle<MapCache> AddToMapCache(Handle<Context> context,
                                  Handle<FixedArray> keys,
                                  Handle<Map> map);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_FACTORY_H_