Reviewers: Mads Ager,

Description:
Version 1.2.8.2.

Merge bleeding_e...@2218 to fix debugger scripts request.


Please review this at http://codereview.chromium.org/132018

SVN Base: http://v8.googlecode.com/svn/trunk/

Affected files:
   M     src/mirror-delay.js
   M     src/version.cc


Index: src/mirror-delay.js
===================================================================
--- src/mirror-delay.js (revision 2210)
+++ src/mirror-delay.js (working copy)
@@ -2051,7 +2051,10 @@
        content.sourceLength = mirror.source().length;
        content.scriptType = mirror.scriptType();
        content.compilationType = mirror.compilationType();
-      if (mirror.compilationType() == 1) {  // Compilation type eval.
+      // For compilation type eval emit information on the script from  
which
+      // eval was called if a script is present.
+      if (mirror.compilationType() == 1 &&
+          mirror.evalFromFunction().script()) {
          content.evalFromScript =
              this.serializeReference(mirror.evalFromFunction().script());
          var evalFromLocation = mirror.evalFromLocation()
Index: src/version.cc
===================================================================
--- src/version.cc      (revision 2210)
+++ src/version.cc      (working copy)
@@ -35,7 +35,7 @@
  #define MAJOR_VERSION     1
  #define MINOR_VERSION     2
  #define BUILD_NUMBER      8
-#define PATCH_LEVEL       1
+#define PATCH_LEVEL       2
  #define CANDIDATE_VERSION false

  // Define SONAME to have the SCons build the put a specific SONAME into the



--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---

Reply via email to