Add probe for V8.Complie

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

Index: third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp b/third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp
index 3b1a8dfec5b4a353f5ff09d14852ee28ecd8cbee..497831041594e7d1e1d67b2b1cc095bb648dbe72 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp
@@ -416,46 +416,49 @@ std::unique_ptr<CompileFn> SelectCompileFunction(V8CacheOptions cache_options,
 }  // namespace
 
 v8::MaybeLocal<v8::Script> V8ScriptRunner::CompileScript(
+    ScriptState* script_state,
     const ScriptSourceCode& source,
-    v8::Isolate* isolate,
     AccessControlStatus access_control_status,
     V8CacheOptions cache_options) {
+  v8::Isolate* isolate = script_state->GetIsolate();
   if (source.Source().length() >= v8::String::kMaxLength) {
     V8ThrowException::ThrowError(isolate, "Source file too large.");
     return v8::Local<v8::Script>();
   }
   return CompileScript(
-      V8String(isolate, source.Source()), source.Url(), source.SourceMapUrl(),
-      source.StartPosition(), isolate, source.GetResource(), source.Streamer(),
+      script_state, V8String(isolate, source.Source()), source.Url(),
+      source.SourceMapUrl(), source.StartPosition(), source.GetResource(),
+      source.Streamer(),
       source.GetResource() ? source.GetResource()->CacheHandler() : nullptr,
       access_control_status, cache_options);
 }
 
 v8::MaybeLocal<v8::Script> V8ScriptRunner::CompileScript(
+    ScriptState* script_state,
     const String& code,
     const String& file_name,
     const String& source_map_url,
     const TextPosition& text_position,
-    v8::Isolate* isolate,
     CachedMetadataHandler* cache_metadata_handler,
     AccessControlStatus access_control_status,
     V8CacheOptions v8_cache_options) {
+  v8::Isolate* isolate = script_state->GetIsolate();
   if (code.length() >= v8::String::kMaxLength) {
     V8ThrowException::ThrowError(isolate, "Source file too large.");
     return v8::Local<v8::Script>();
   }
-  return CompileScript(V8String(isolate, code), file_name, source_map_url,
-                       text_position, isolate, nullptr, nullptr,
+  return CompileScript(script_state, V8String(isolate, code), file_name,
+                       source_map_url, text_position, nullptr, nullptr,
                        cache_metadata_handler, access_control_status,
                        v8_cache_options);
 }
 
 v8::MaybeLocal<v8::Script> V8ScriptRunner::CompileScript(
+    ScriptState* script_state,
     v8::Local<v8::String> code,
     const String& file_name,
     const String& source_map_url,
     const TextPosition& script_start_position,
-    v8::Isolate* isolate,
     ScriptResource* resource,
     ScriptStreamer* streamer,
     CachedMetadataHandler* cache_handler,
@@ -465,12 +468,16 @@ v8::MaybeLocal<v8::Script> V8ScriptRunner::CompileScript(
       "v8,devtools.timeline", "v8.compile", "fileName", file_name.Utf8(),
       "data",
       InspectorCompileScriptEvent::Data(file_name, script_start_position));
+  probe::V8Compile probe(ExecutionContext::From(script_state), file_name,
+                         script_start_position.line_.ZeroBasedInt(),
+                         script_start_position.column_.ZeroBasedInt());
 
   DCHECK(!streamer || resource);
   DCHECK(!resource || resource->CacheHandler() == cache_handler);
 
   // NOTE: For compatibility with WebCore, ScriptSourceCode's line starts at
   // 1, whereas v8 starts at 0.
+  v8::Isolate* isolate = script_state->GetIsolate();
   v8::ScriptOrigin origin(
       V8String(isolate, file_name),
       v8::Integer::New(isolate, script_start_position.line_.ZeroBasedInt()),
@@ -587,8 +594,9 @@ v8::MaybeLocal<v8::Value> V8ScriptRunner::CompileAndRunInternalScript(
     const TextPosition& script_start_position) {
   v8::Local<v8::Script> script;
   if (!V8ScriptRunner::CompileScript(
-           source, file_name, String(), script_start_position, isolate, nullptr,
-           nullptr, nullptr, kSharableCrossOrigin, kV8CacheOptionsDefault)
+           ScriptState::From(isolate->GetCurrentContext()), source, file_name,

[Liquan (Max) Gu, 2017/07/18 21:18:50]

I am blocked on this test. All tests in DocumentWriteEvaluatorTest fail on
ScriptState::From(). Is it because the setup of the test hit the assumption of
From()? 

    // ScriptState::from() must not be called for a context that does not have
    // valid embedder data in the embedder field.

Here's the stack trace. https://paste.googleplex.com/6174034731466752

[haraken, 2017/07/19 05:51:19]

Ah, I think that the problem is that DocumentWriteEvaluator doesn't create any
ScriptState.

I think that a solution would be to change DocumentWriteEvaluator to create a
ScriptState in  DocumentWriteEvaluator::EnsureEvaluationContext(). This is a bit
complex so maybe the binding teams should handle this (unless you want to fix
yourself :-).

yukishiino@: Would you mind helping on this?

+           String(), script_start_position, nullptr, nullptr, nullptr,
+           kSharableCrossOrigin, kV8CacheOptionsDefault)
            .ToLocal(&script))
     return v8::MaybeLocal<v8::Value>();