Merge V8 at r10110: Roll to 3.2.10.40
Bug: 5654713
Change-Id: I94eb0ed43c585bb042456cb60365e7d9f0f642e6
diff --git a/V8_MERGE_REVISION b/V8_MERGE_REVISION
index 1be7896..a6c144f 100644
--- a/V8_MERGE_REVISION
+++ b/V8_MERGE_REVISION
@@ -2,4 +2,4 @@
We have synced V8 past the last revision used in Chrome 12, as we continue to take 3.2 updates.
-http://v8.googlecode.com/svn/branches/3.2@9719
+http://v8.googlecode.com/svn/branches/3.2@10110
diff --git a/src/log.h b/src/log.h
index 4fb0e23..1fa86d2 100644
--- a/src/log.h
+++ b/src/log.h
@@ -294,7 +294,13 @@
INLINE(static LogEventsAndTags ToNativeByScript(LogEventsAndTags, Script*));
// Profiler's sampling interval (in milliseconds).
+#if defined(ANDROID)
+ // Phones and tablets have processors that are much slower than desktop
+ // and laptop computers for which current heuristics are tuned.
+ static const int kSamplingIntervalMs = 5;
+#else
static const int kSamplingIntervalMs = 1;
+#endif
// Callback from Log, stops profiling in case of insufficient resources.
void LogFailure();
diff --git a/src/version.cc b/src/version.cc
index 1d59be3..47e7fe2 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 2
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 39
+#define PATCH_LEVEL 40
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
