summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-08 18:03:49 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-08 18:03:49 +0000
commit80f12bb42bd8376d623470102e81e0056c46fa28 (patch)
tree91441e61a3be8f34a6fe709a0ca06935e8a30673
parent650a1a76e2efb22ecf35fc26ee9db7371b1ef5b2 (diff)
downloadchromium_src-80f12bb42bd8376d623470102e81e0056c46fa28.zip
chromium_src-80f12bb42bd8376d623470102e81e0056c46fa28.tar.gz
chromium_src-80f12bb42bd8376d623470102e81e0056c46fa28.tar.bz2
Update chrome trunk's v8 dependency from trunk@101 to trunk@138.
This picks up the "in" operator fix that was made in branches/v8_bleeding@117. $ svn log -r 102:138 http://v8.googlecode.com/svn/trunk ------------------------------------------------------------------------ r138 | ager@chromium.org | 2008-09-04 06:52:27 -0700 (Thu, 04 Sep 2008) | 10 lines Added support for running tests on the ARM simulator. Fixed bug in the 'in' operator where negative indices were not treated correctly. Fixed build issues on gcc-4.3.1. Changed Date.prototype.toLocaleTimeString to not print the timezone part of the time. Renamed debug.h to v8-debug.h to reduce the risk of name conflicts with user code. ------------------------------------------------------------------------ Review URL: http://codereview.chromium.org/1602 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1851 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/glue/debugger.cc2
-rw-r--r--webkit/glue/debugger.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index be5172d..a0d88ea 100644
--- a/DEPS
+++ b/DEPS
@@ -24,7 +24,7 @@ deps = {
"/trunk/deps/third_party/svn@1791",
"src/v8":
- "http://v8.googlecode.com/svn/trunk@101",
+ "http://v8.googlecode.com/svn/trunk@138",
"src/webkit/data/layout_tests/LayoutTests":
"http://svn.webkit.org/repository/webkit/branches/Safari-3-1-branch/LayoutTests@31256",
diff --git a/webkit/glue/debugger.cc b/webkit/glue/debugger.cc
index 53c0a7d..3286bcd 100644
--- a/webkit/glue/debugger.cc
+++ b/webkit/glue/debugger.cc
@@ -8,7 +8,7 @@
#if USE(V8_BINDING)
#define USING_V8
-#include "v8/include/debug.h"
+#include "v8/include/v8-debug.h"
#endif
void V8DebugMessageHandler(const uint16_t* message, int length, void* data) {
diff --git a/webkit/glue/debugger.h b/webkit/glue/debugger.h
index 24f1c4d..3d8cefd 100644
--- a/webkit/glue/debugger.h
+++ b/webkit/glue/debugger.h
@@ -13,7 +13,7 @@
#include "base/basictypes.h"
#include "base/message_loop.h"
-#include "v8/include/debug.h"
+#include "v8/include/v8-debug.h"
void V8DebugMessageHandler(const uint16_t* message, int length, void* data);