Add origin information to trace events for runCompiledScript and callFunction

third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 377 matching lines @@
         ? selectCompileFunction(cacheOptions, resource, streamer)
         : selectCompileFunction(cacheOptions, cacheHandler, code, cacheabilityIfNoHandler);
 
     return (*compileFn)(isolate, code, origin);
 }
 
 v8::MaybeLocal<v8::Value> V8ScriptRunner::runCompiledScript(v8::Isolate* isolate, v8::Local<v8::Script> script, ExecutionContext* context)
 {
     ASSERT(!script.IsEmpty());
     TRACE_EVENT_SCOPED_SAMPLING_STATE("v8", "V8Execution");
-    TRACE_EVENT1("v8", "v8.run", "fileName", TRACE_STR_COPY(*v8::String::Utf8Value(script->GetUnboundScript()->GetScriptName())));
+    bool isCrossOrigin = context->isDocument() && toDocument(context)->frame()->isCrossOrigin();
+    TRACE_EVENT2("v8", "v8.run", "fileName", TRACE_STR_COPY(*v8::String::Utf8Value(script->GetUnboundScript()->GetScriptName())), "origin", (isCrossOrigin ? "cross-origin" : "same-origin"));
 
     if (v8::MicrotasksScope::GetCurrentDepth(isolate) >= kMaxRecursionDepth)
         return throwStackOverflowExceptionIfNeeded(isolate);
 
     RELEASE_ASSERT(!context->isIteratingOverObservers());
 
     // Run the script and keep track of the current recursion depth.
     v8::MaybeLocal<v8::Value> result;
     {
         if (ScriptForbiddenScope::isScriptForbidden()) {
@@ skipping 70 matching lines @@
         ThreadDebugger::didExecuteScript(isolate);
     }
     if (!depth)
         TRACE_EVENT_END0("devtools.timeline", "FunctionCall");
     return result;
 }
 
 v8::MaybeLocal<v8::Value> V8ScriptRunner::callFunction(v8::Local<v8::Function> function, ExecutionContext* context, v8::Local<v8::Value> receiver, int argc, v8::Local<v8::Value> args[], v8::Isolate* isolate)
 {
     ScopedFrameBlamer frameBlamer(context->isDocument() ? toDocument(context)->frame() : nullptr);
-    TRACE_EVENT0("v8", "v8.callFunction");
+    bool isCrossOrigin = context->isDocument() && toDocument(context)->frame()->isCrossOrigin();

[Sami, 2016/06/14 22:36:10]

Doesn't frameblamer already give us this? The scoped object above ensures we can
find out which url we were executing script for in about:tracing. Maybe we just
need to add the same scope to runCompiledScript?

+    TRACE_EVENT1("v8", "v8.callFunction", "origin", (isCrossOrigin ? "cross-origin" : "same-origin"));
     TRACE_EVENT_SCOPED_SAMPLING_STATE("v8", "V8Execution");
 
     int depth = v8::MicrotasksScope::GetCurrentDepth(isolate);
     if (depth >= kMaxRecursionDepth)
         return v8::MaybeLocal<v8::Value>(throwStackOverflowExceptionIfNeeded(isolate));
 
     RELEASE_ASSERT(!context->isIteratingOverObservers());
 
     if (ScriptForbiddenScope::isScriptForbidden()) {
         throwScriptForbiddenException(isolate);
@@ skipping 75 matching lines @@
 // Store a timestamp to the cache as hint.
 void V8ScriptRunner::setCacheTimeStamp(CachedMetadataHandler* cacheHandler)
 {
     double now = WTF::currentTime();
     unsigned tag = cacheTag(CacheTagTimeStamp, cacheHandler);
     cacheHandler->clearCachedMetadata(CachedMetadataHandler::CacheLocally);
     cacheHandler->setCachedMetadata(tag, reinterpret_cast<char*>(&now), sizeof(now), CachedMetadataHandler::SendToPlatform);
 }
 
 } // namespace blink