Merge isolates to bleeding_edge.

src/scopes.h

 // Copyright 2010 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 210 matching lines @@
 
   // The scope immediately surrounding this scope, or NULL.
   Scope* outer_scope() const { return outer_scope_; }
 
   // ---------------------------------------------------------------------------
   // Accessors.
 
   // A new variable proxy corresponding to the (function) receiver.
   VariableProxy* receiver() const {
     VariableProxy* proxy =
-        new VariableProxy(Factory::this_symbol(), true, false);
+        new VariableProxy(FACTORY->this_symbol(), true, false);
     proxy->BindTo(receiver_);
     return proxy;
   }
 
   // The variable holding the function literal for named function
   // literals, or NULL.
   // Only valid for function scopes.
   Variable* function() const {
     ASSERT(is_function_scope());
     return function_;
@@ skipping 177 matching lines @@
       inner_scopes_.Add(inner_scope);
       inner_scope->outer_scope_ = this;
     }
   }
 
   void SetDefaults(Type type,
                    Scope* outer_scope,
                    SerializedScopeInfo* scope_info) {
     outer_scope_ = outer_scope;
     type_ = type;
-    scope_name_ = Factory::empty_symbol();
+    scope_name_ = FACTORY->empty_symbol();
     dynamics_ = NULL;
     receiver_ = NULL;
     function_ = NULL;
     arguments_ = NULL;
     arguments_shadow_ = NULL;
     illegal_redecl_ = NULL;
     scope_inside_with_ = false;
     scope_contains_with_ = false;
     scope_calls_eval_ = false;
     // Inherit the strict mode from the parent scope.
@@ skipping 55 matching lines @@
   int nesting_level_;
   // Nesting level of outermost scope that is contained in a with statement,
   // or kNotInsideWith if there are no with's around the current scope.
   int inside_with_level_;
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_SCOPES_H_