Merge isolates to bleeding_edge.

src/scanner.cc

Index: src/scanner.cc
===================================================================
--- src/scanner.cc	(revision 7267)
+++ src/scanner.cc	(working copy)
@@ -328,9 +328,7 @@
 // ----------------------------------------------------------------------------
 // V8JavaScriptScanner
 
-V8JavaScriptScanner::V8JavaScriptScanner() : JavaScriptScanner() { }
 
-
 void V8JavaScriptScanner::Initialize(UC16CharacterStream* source) {
   source_ = source;
   // Need to capture identifiers in order to recognize "get" and "set"
@@ -347,7 +345,7 @@
 // ----------------------------------------------------------------------------
 // JsonScanner
 
-JsonScanner::JsonScanner() : Scanner() { }
+JsonScanner::JsonScanner(Isolate* isolate) : Scanner(isolate) { }
 
 
 void JsonScanner::Initialize(UC16CharacterStream* source) {
@@ -576,11 +574,10 @@
     Advance();
     text++;
   }
-  if (ScannerConstants::kIsIdentifierPart.get(c0_)) return Token::ILLEGAL;
+  if (scanner_constants_->IsIdentifierPart(c0_)) return Token::ILLEGAL;
   literal.Complete();
   return token;
 }
 
 
-
 } }  // namespace v8::internal