diff options
| author | Ben Murdoch <benm@google.com> | 2011-12-01 09:07:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-01 09:07:59 -0800 |
| commit | 92022043ea907575278de828a5c9cf6939b51e5e (patch) | |
| tree | e3e7f5da6f5f5d4c06b2f0559ece0c7f033015f9 | |
| parent | f857b2fbf79b6c167d03fc7417f6f9ad9c6e2abd (diff) | |
| parent | 7549248b8e9ff356d1d3fa834020a789897aa139 (diff) | |
| download | android_external_v8-92022043ea907575278de828a5c9cf6939b51e5e.tar.gz android_external_v8-92022043ea907575278de828a5c9cf6939b51e5e.tar.bz2 android_external_v8-92022043ea907575278de828a5c9cf6939b51e5e.zip | |
am 7549248b: Merge V8 at r10110: Roll to 3.2.10.40
* commit '7549248b8e9ff356d1d3fa834020a789897aa139':
Merge V8 at r10110: Roll to 3.2.10.40
| -rw-r--r-- | V8_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | src/log.h | 6 | ||||
| -rw-r--r-- | src/version.cc | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/V8_MERGE_REVISION b/V8_MERGE_REVISION index 1be7896d..a6c144f8 100644 --- a/V8_MERGE_REVISION +++ b/V8_MERGE_REVISION @@ -2,4 +2,4 @@ We are tracking the V8 3.2 release branch as used by the Chrome 12 release branc 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 @@ -294,7 +294,13 @@ class Logger { 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 1d59be3c..47e7fe25 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 |