Revert r11782, r11783 and r11790 due to Webkit failures.

src/scopes.cc

Index: src/scopes.cc
diff --git a/src/scopes.cc b/src/scopes.cc
index b77eac0f343e78006e88d5d69d8b9bcb412a98d1..ad6692e57fde763d4fa1fbfc7a9c0104130efb21 100644
--- a/src/scopes.cc
+++ b/src/scopes.cc
@@ -637,6 +637,11 @@ bool Scope::AllocateVariables(CompilationInfo* info,
 }
 
 
+bool Scope::AllowsLazyCompilation() const {
+  return !force_eager_compilation_ && HasTrivialOuterContext();
+}
+
+
 bool Scope::HasTrivialContext() const {
   // A function scope has a trivial context if it always is the global
   // context. We iteratively scan out the context chain to see if
@@ -661,17 +666,12 @@ bool Scope::HasTrivialOuterContext() const {
 }
 
 
-bool Scope::AllowsLazyCompilation() const {
+bool Scope::AllowsLazyRecompilation() const {
   return !force_eager_compilation_ &&
          !TrivialDeclarationScopesBeforeWithScope();
 }
 
 
-bool Scope::AllowsLazyCompilationWithoutContext() const {
-  return !force_eager_compilation_ && HasTrivialOuterContext();
-}
-
-
 bool Scope::TrivialDeclarationScopesBeforeWithScope() const {
   Scope* outer = outer_scope_;
   if (outer == NULL) return false;