[Isolates] Merge from bleeding_edge to isolates, revisions 6100-6300.

src/scanner.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 118 matching lines @@
 // ----------------------------------------------------------------------------
 // V8JavaScriptScanner
 // JavaScript scanner getting its input from either a V8 String or a unicode
 // CharacterStream.
 
 class V8JavaScriptScanner : public JavaScriptScanner {
  public:
   explicit V8JavaScriptScanner(Isolate* isolate)
       : JavaScriptScanner(isolate) {}
 
-  void Initialize(UC16CharacterStream* source,
-                  int literal_flags = kAllLiterals);
+  void Initialize(UC16CharacterStream* source);
 };
 
 
 class JsonScanner : public Scanner {
  public:
   JsonScanner(Isolate* isolate);
 
   void Initialize(UC16CharacterStream* source);
 
   // Returns the next token.
@@ skipping 27 matching lines @@
 
   // Used to recognizes one of the literals "true", "false", or "null". These
   // are the only valid JSON identifiers (productions JSONBooleanLiteral,
   // JSONNullLiteral).
   Token::Value ScanJsonIdentifier(const char* text, Token::Value token);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_SCANNER_H_