diff options
| author | Ben Murdoch <benm@google.com> | 2016-09-16 13:49:30 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2016-09-23 11:30:04 +0100 |
| commit | 13e2dadd00298019ed862f2b2fc5068bba730bcf (patch) | |
| tree | 8d68955e70aae5b4afbfad61346ac5d6b9b1862e /src/log-inl.h | |
| parent | 50c70ae05086e6572e0064594c698ae182e4a8bd (diff) | |
| download | android_external_v8-13e2dadd00298019ed862f2b2fc5068bba730bcf.tar.gz android_external_v8-13e2dadd00298019ed862f2b2fc5068bba730bcf.tar.bz2 android_external_v8-13e2dadd00298019ed862f2b2fc5068bba730bcf.zip | |
Merge V8 5.3.332.45.
Test: Manual
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
Diffstat (limited to 'src/log-inl.h')
| -rw-r--r-- | src/log-inl.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/log-inl.h b/src/log-inl.h index 765398fd..b9865976 100644 --- a/src/log-inl.h +++ b/src/log-inl.h @@ -13,25 +13,24 @@ namespace v8 { namespace internal { -Logger::LogEventsAndTags Logger::ToNativeByScript(Logger::LogEventsAndTags tag, - Script* script) { - if ((tag == FUNCTION_TAG || tag == LAZY_COMPILE_TAG || tag == SCRIPT_TAG) && - script->type() == Script::TYPE_NATIVE) { - switch (tag) { - case FUNCTION_TAG: return NATIVE_FUNCTION_TAG; - case LAZY_COMPILE_TAG: return NATIVE_LAZY_COMPILE_TAG; - case SCRIPT_TAG: return NATIVE_SCRIPT_TAG; - default: return tag; - } - } else { - return tag; +CodeEventListener::LogEventsAndTags Logger::ToNativeByScript( + CodeEventListener::LogEventsAndTags tag, Script* script) { + if (script->type() != Script::TYPE_NATIVE) return tag; + switch (tag) { + case CodeEventListener::FUNCTION_TAG: + return CodeEventListener::NATIVE_FUNCTION_TAG; + case CodeEventListener::LAZY_COMPILE_TAG: + return CodeEventListener::NATIVE_LAZY_COMPILE_TAG; + case CodeEventListener::SCRIPT_TAG: + return CodeEventListener::NATIVE_SCRIPT_TAG; + default: + return tag; } } - void Logger::CallEventLogger(Isolate* isolate, const char* name, StartEnd se, bool expose_to_api) { - if (isolate->event_logger() != NULL) { + if (isolate->event_logger()) { if (isolate->event_logger() == DefaultEventLoggerSentinel) { LOG(isolate, TimerEvent(se, name)); } else if (expose_to_api) { @@ -39,6 +38,7 @@ void Logger::CallEventLogger(Isolate* isolate, const char* name, StartEnd se, } } } + } // namespace internal } // namespace v8 |