Merge V8 at r7668: Initial merge by Git.

Change-Id: I1703c8b4f5c63052451a22cf3fb878abc9a0ec75

2 files changed, 11 insertions, 6 deletions

diff --git a/include/v8-preparser.h b/include/v8-preparser.h
index 9425f7d4..4d46bad7 100644
--- a/include/v8-preparser.h
+++ b/include/v8-preparser.h
@@ -1,4 +1,4 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
+// 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:
@@ -67,16 +67,16 @@
 namespace v8 {
 
 
-class PreParserData {
+class V8EXPORT PreParserData {
  public:
   PreParserData(size_t size, const uint8_t* data)
       : data_(data), size_(size) { }
 
   // Create a PreParserData value where stack_overflow reports true.
-  static PreParserData StackOverflow() { return PreParserData(NULL, 0); }
+  static PreParserData StackOverflow() { return PreParserData(0, NULL); }
+
   // Whether the pre-parser stopped due to a stack overflow.
   // If this is the case, size() and data() should not be used.
-
   bool stack_overflow() { return size_ == 0u; }
 
   // The size of the data in bytes.
@@ -92,7 +92,7 @@ class PreParserData {
 
 
 // Interface for a stream of Unicode characters.
-class UnicodeInputStream {
+class V8EXPORT UnicodeInputStream {  // NOLINT - Thinks V8EXPORT is class name.
  public:
   virtual ~UnicodeInputStream();
 
diff --git a/include/v8.h b/include/v8.h
index 62d1085c..d15d024d 100644
--- a/include/v8.h
+++ b/include/v8.h
@@ -1653,6 +1653,11 @@ class Object : public Value {
   V8EXPORT Local<Object> Clone();
 
   /**
+   * Returns the context in which the object was created.
+   */
+  V8EXPORT Local<Context> CreationContext();
+
+  /**
    * Set the backing store of the indexed properties to be managed by the
    * embedding layer. Access to the indexed properties will follow the rules
    * spelled out in CanvasPixelArray.
@@ -3291,7 +3296,7 @@ class V8EXPORT Context {
    */
   class Scope {
    public:
-    inline Scope(Handle<Context> context) : context_(context) {
+    explicit inline Scope(Handle<Context> context) : context_(context) {
       context_->Enter();
     }
     inline ~Scope() { context_->Exit(); }